Skip to content

Commit 881e5a5

Browse files
refactor: replace golang.org/x/exp with stdlib (backport #1058) (#1079)
Co-authored-by: LesCyber <[email protected]>
1 parent 5c4fa13 commit 881e5a5

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

v2/go.mod

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,22 @@ require (
77
github.com/bvinc/go-sqlite-lite v0.6.1
88
github.com/cosmos/iavl-bench/bench v0.0.4
99
github.com/dustin/go-humanize v1.0.1
10+
<<<<<<< HEAD
1011
github.com/emicklei/dot v1.6.0
1112
github.com/kocubinski/costor-api v1.1.1
1213
github.com/prometheus/client_golang v1.16.0
1314
github.com/rs/zerolog v1.30.0
1415
github.com/spf13/cobra v1.7.0
1516
github.com/stretchr/testify v1.8.4
1617
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
18+
=======
19+
github.com/emicklei/dot v1.8.0
20+
github.com/kocubinski/costor-api v1.1.2
21+
github.com/prometheus/client_golang v1.21.1
22+
github.com/spf13/cobra v1.9.1
23+
github.com/stretchr/testify v1.10.0
24+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
25+
>>>>>>> 48b7c38 (refactor: replace golang.org/x/exp with stdlib (#1058))
1726
)
1827

1928
require (

v2/multitree.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@ import (
55
"errors"
66
"fmt"
77
"path/filepath"
8+
<<<<<<< HEAD
9+
=======
10+
"slices"
11+
"runtime"
12+
>>>>>>> 48b7c38 (refactor: replace golang.org/x/exp with stdlib (#1058))
813
"sync/atomic"
914

1015
"github.com/cosmos/iavl/v2/metrics"
1116
"github.com/dustin/go-humanize"
12-
"golang.org/x/exp/slices"
1317
)
1418

1519
// MultiTree encapsulates multiple IAVL trees, each with its own "store key" in the context of the Cosmos SDK.

0 commit comments

Comments
 (0)