From 747830ca11da0f764b5cc1106967a64a1cc0e88c Mon Sep 17 00:00:00 2001 From: Hieu Vu <72878483+hieuvubk@users.noreply.github.com> Date: Wed, 15 Nov 2023 01:40:14 +0700 Subject: [PATCH] replace all cometbft db --- baseapp/abci_test.go | 2 +- baseapp/baseapp.go | 2 +- baseapp/baseapp_test.go | 2 +- baseapp/block_gas_test.go | 2 +- baseapp/grpcrouter_test.go | 2 +- baseapp/msg_service_router_test.go | 2 +- baseapp/options.go | 7 +------ baseapp/utils_test.go | 2 +- client/grpc_query_test.go | 2 +- client/pruning/main.go | 2 +- client/snapshot/restore.go | 2 +- orm/internal/testkv/leveldb.go | 2 +- orm/internal/testkv/mem.go | 2 +- orm/model/ormtable/bench_test.go | 2 +- orm/model/ormtable/table_test.go | 2 +- orm/types/kv/store.go | 2 +- runtime/builder.go | 2 +- server/constructors_test.go | 2 +- server/mock/store.go | 6 +----- server/mock/store_test.go | 2 +- server/types/app.go | 2 +- server/util.go | 3 +-- server/util_test.go | 2 +- simapp/app.go | 2 +- simapp/app_test.go | 2 +- simapp/app_v2.go | 2 +- simapp/sim_test.go | 2 +- simapp/simd/cmd/root.go | 2 +- simapp/test_helpers.go | 2 +- snapshots/helpers_test.go | 2 +- snapshots/manager_test.go | 2 +- snapshots/store.go | 2 +- snapshots/store_test.go | 2 +- store/cachekv/benchmark_test.go | 2 +- store/cachekv/store.go | 2 +- store/cachekv/store_bench_test.go | 2 +- store/cachekv/store_test.go | 2 +- store/cachemulti/store.go | 2 +- store/dbadapter/store.go | 2 +- store/gaskv/store_test.go | 2 +- store/listenkv/store_test.go | 2 +- store/mem/store.go | 2 +- store/pruning/manager.go | 2 +- store/pruning/manager_test.go | 2 +- store/pruning/mock/db_mock.go | 2 +- store/rootmulti/proof_test.go | 2 +- store/rootmulti/snapshot_test.go | 2 +- store/rootmulti/store.go | 8 +------- store/rootmulti/store_test.go | 2 +- store/store.go | 2 +- store/streaming/constructor_test.go | 2 +- store/tracekv/store_test.go | 2 +- store/transient/store.go | 2 +- store/types/iterator_test.go | 6 +++--- store/types/utils_test.go | 2 +- tests/e2e/params/suite.go | 2 +- tests/e2e/server/export_test.go | 2 +- tests/integration/gov/module_test.go | 2 +- tests/integration/store/rootmulti/rollback_test.go | 2 +- testutil/context.go | 2 +- testutil/mock/tendermint_tm_db_DB.go | 2 +- testutil/network/network.go | 2 +- testutil/sims/app_helpers.go | 2 +- testutil/sims/simulation_helpers.go | 2 +- types/query/pagination.go | 2 +- types/store_test.go | 2 +- x/group/internal/orm/testsupport.go | 2 +- x/group/keeper/invariants_test.go | 2 +- x/params/types/subspace_test.go | 2 +- x/upgrade/types/storeloader_test.go | 2 +- 70 files changed, 72 insertions(+), 88 deletions(-) diff --git a/baseapp/abci_test.go b/baseapp/abci_test.go index c3d606db018a..1280f6a7020a 100644 --- a/baseapp/abci_test.go +++ b/baseapp/abci_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/gogoproto/jsonpb" "github.com/stretchr/testify/require" diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index 9b4faa5376ed..e399c55ab01c 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -6,11 +6,11 @@ import ( "sort" "strings" - dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/crypto/tmhash" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/gogoproto/proto" "golang.org/x/exp/maps" diff --git a/baseapp/baseapp_test.go b/baseapp/baseapp_test.go index a821ca1e4456..86df1a4d0072 100644 --- a/baseapp/baseapp_test.go +++ b/baseapp/baseapp_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" "github.com/cosmos/cosmos-sdk/baseapp" diff --git a/baseapp/block_gas_test.go b/baseapp/block_gas_test.go index 81b39a0c2a81..7af1bbf37307 100644 --- a/baseapp/block_gas_test.go +++ b/baseapp/block_gas_test.go @@ -6,11 +6,11 @@ import ( "math" "testing" - dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" tmjson "github.com/cometbft/cometbft/libs/json" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" "cosmossdk.io/depinject" diff --git a/baseapp/grpcrouter_test.go b/baseapp/grpcrouter_test.go index 2e364613ff42..860e7bbe75c1 100644 --- a/baseapp/grpcrouter_test.go +++ b/baseapp/grpcrouter_test.go @@ -6,8 +6,8 @@ import ( "sync" "testing" - dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" "cosmossdk.io/depinject" diff --git a/baseapp/msg_service_router_test.go b/baseapp/msg_service_router_test.go index 677c6622c6fb..b3c262f13a54 100644 --- a/baseapp/msg_service_router_test.go +++ b/baseapp/msg_service_router_test.go @@ -4,10 +4,10 @@ import ( "os" "testing" - dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" "cosmossdk.io/depinject" diff --git a/baseapp/options.go b/baseapp/options.go index e669495f647d..2171c06a8dd6 100644 --- a/baseapp/options.go +++ b/baseapp/options.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/snapshots" @@ -70,11 +70,6 @@ func SetIAVLDisableFastNode(disable bool) func(*BaseApp) { return func(bapp *BaseApp) { bapp.cms.SetIAVLDisableFastNode(disable) } } -// SetIAVLLazyLoading enables/disables lazy loading of the IAVL store. -func SetIAVLLazyLoading(lazyLoading bool) func(*BaseApp) { - return func(bapp *BaseApp) { bapp.cms.SetLazyLoading(lazyLoading) } -} - // SetInterBlockCache provides a BaseApp option function that sets the // inter-block cache. func SetInterBlockCache(cache sdk.MultiStorePersistentCache) func(*BaseApp) { diff --git a/baseapp/utils_test.go b/baseapp/utils_test.go index b6b62db711ce..beec38d95616 100644 --- a/baseapp/utils_test.go +++ b/baseapp/utils_test.go @@ -25,10 +25,10 @@ import ( txconfigv1 "cosmossdk.io/api/cosmos/tx/config/v1" "cosmossdk.io/core/appconfig" "cosmossdk.io/depinject" - dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" tmtypes "github.com/cometbft/cometbft/types" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" "github.com/cosmos/cosmos-sdk/baseapp" diff --git a/client/grpc_query_test.go b/client/grpc_query_test.go index 5fb8998366b6..ba89bbf99242 100644 --- a/client/grpc_query_test.go +++ b/client/grpc_query_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" tmjson "github.com/cometbft/cometbft/libs/json" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/suite" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/client/pruning/main.go b/client/pruning/main.go index 247cd2c360c9..396fab124d7e 100644 --- a/client/pruning/main.go +++ b/client/pruning/main.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/server" servertypes "github.com/cosmos/cosmos-sdk/server/types" diff --git a/client/snapshot/restore.go b/client/snapshot/restore.go index 9b134ca7d62a..8d1cf7a7a3d9 100644 --- a/client/snapshot/restore.go +++ b/client/snapshot/restore.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/server" servertypes "github.com/cosmos/cosmos-sdk/server/types" ) diff --git a/orm/internal/testkv/leveldb.go b/orm/internal/testkv/leveldb.go index c032809a705f..3262f60fd21b 100644 --- a/orm/internal/testkv/leveldb.go +++ b/orm/internal/testkv/leveldb.go @@ -3,7 +3,7 @@ package testkv import ( "testing" - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" "gotest.tools/v3/assert" "github.com/cosmos/cosmos-sdk/orm/model/ormtable" diff --git a/orm/internal/testkv/mem.go b/orm/internal/testkv/mem.go index 99185964cc11..d2c89a2e8db4 100644 --- a/orm/internal/testkv/mem.go +++ b/orm/internal/testkv/mem.go @@ -1,7 +1,7 @@ package testkv import ( - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/orm/model/ormtable" ) diff --git a/orm/model/ormtable/bench_test.go b/orm/model/ormtable/bench_test.go index a4b1ae901771..0c11a1ce17b9 100644 --- a/orm/model/ormtable/bench_test.go +++ b/orm/model/ormtable/bench_test.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/orm/internal/testkv" "github.com/cosmos/cosmos-sdk/orm/testing/ormtest" - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" "gotest.tools/v3/assert" "github.com/cosmos/cosmos-sdk/orm/internal/testpb" diff --git a/orm/model/ormtable/table_test.go b/orm/model/ormtable/table_test.go index 539269d642ba..40a31a3228b8 100644 --- a/orm/model/ormtable/table_test.go +++ b/orm/model/ormtable/table_test.go @@ -11,7 +11,7 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" diff --git a/orm/types/kv/store.go b/orm/types/kv/store.go index 3e2a907b4168..a25ae296ba18 100644 --- a/orm/types/kv/store.go +++ b/orm/types/kv/store.go @@ -3,7 +3,7 @@ package kv import ( - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" ) // ReadonlyStore is an interface for readonly access to a kv-store. diff --git a/runtime/builder.go b/runtime/builder.go index 76452e4c5176..e214dbeed54c 100644 --- a/runtime/builder.go +++ b/runtime/builder.go @@ -4,8 +4,8 @@ import ( "encoding/json" "io" - dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/types/module" diff --git a/server/constructors_test.go b/server/constructors_test.go index 5208bdcb28a0..02e3c51feb9d 100644 --- a/server/constructors_test.go +++ b/server/constructors_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" ) func Test_openDB(t *testing.T) { diff --git a/server/mock/store.go b/server/mock/store.go index 192c58e5526e..2b9bd99be3cc 100644 --- a/server/mock/store.go +++ b/server/mock/store.go @@ -3,7 +3,7 @@ package mock import ( "io" - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" protoio "github.com/cosmos/gogoproto/io" snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types" @@ -134,10 +134,6 @@ func (ms multiStore) SetIAVLDisableFastNode(disable bool) { panic("not implemented") } -func (ms multiStore) SetLazyLoading(bool) { - panic("not implemented") -} - func (ms multiStore) SetInitialVersion(version int64) error { panic("not implemented") } diff --git a/server/mock/store_test.go b/server/mock/store_test.go index bc5faa363b32..b00f75382d96 100644 --- a/server/mock/store_test.go +++ b/server/mock/store_test.go @@ -3,7 +3,7 @@ package mock import ( "testing" - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" storetypes "github.com/cosmos/cosmos-sdk/store/types" diff --git a/server/types/app.go b/server/types/app.go index 727f767fc35e..e13244f58e0a 100644 --- a/server/types/app.go +++ b/server/types/app.go @@ -5,11 +5,11 @@ import ( "io" "time" - dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" tmtypes "github.com/cometbft/cometbft/types" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/gogoproto/grpc" "github.com/spf13/cobra" diff --git a/server/util.go b/server/util.go index 9a6ae40f786e..fbb7aafe11bc 100644 --- a/server/util.go +++ b/server/util.go @@ -21,11 +21,11 @@ import ( "github.com/spf13/viper" "cosmossdk.io/log" - dbm "github.com/cometbft/cometbft-db" tmcmd "github.com/cometbft/cometbft/cmd/cometbft/commands" tmcfg "github.com/cometbft/cometbft/config" tmlog "github.com/cometbft/cometbft/libs/log" tmtypes "github.com/cometbft/cometbft/types" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client/flags" @@ -493,7 +493,6 @@ func DefaultBaseappOptions(appOpts types.AppOptions) []func(*baseapp.BaseApp) { mempool.SenderNonceMaxTxOpt(cast.ToInt(appOpts.Get(FlagMempoolMaxTxs))), ), ), - baseapp.SetIAVLLazyLoading(cast.ToBool(appOpts.Get(FlagIAVLLazyLoading))), baseapp.SetChainID(chainID), } } diff --git a/server/util_test.go b/server/util_test.go index 2b897c919258..ee516252c001 100644 --- a/server/util_test.go +++ b/server/util_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - db "github.com/cometbft/cometbft-db" tmcfg "github.com/cometbft/cometbft/config" + db "github.com/cosmos/cosmos-db" "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/stretchr/testify/require" diff --git a/simapp/app.go b/simapp/app.go index 078bda019336..d8dd5577b746 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -10,9 +10,9 @@ import ( autocliv1 "cosmossdk.io/api/cosmos/autocli/v1" reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1" - dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" + dbm "github.com/cosmos/cosmos-db" "github.com/spf13/cast" simappparams "cosmossdk.io/simapp/params" diff --git a/simapp/app_test.go b/simapp/app_test.go index 907ebb7ddebf..c3e4018ebdda 100644 --- a/simapp/app_test.go +++ b/simapp/app_test.go @@ -6,10 +6,10 @@ import ( "os" "testing" - dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + dbm "github.com/cosmos/cosmos-db" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" diff --git a/simapp/app_v2.go b/simapp/app_v2.go index 57a498ac250e..301e8300b04d 100644 --- a/simapp/app_v2.go +++ b/simapp/app_v2.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" + dbm "github.com/cosmos/cosmos-db" "cosmossdk.io/depinject" diff --git a/simapp/sim_test.go b/simapp/sim_test.go index d99165a5fe5a..1c3435d7b053 100644 --- a/simapp/sim_test.go +++ b/simapp/sim_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/simapp/simd/cmd/root.go b/simapp/simd/cmd/root.go index a6270721d16d..8a2c6c1e7dd6 100644 --- a/simapp/simd/cmd/root.go +++ b/simapp/simd/cmd/root.go @@ -7,9 +7,9 @@ import ( rosettaCmd "cosmossdk.io/tools/rosetta/cmd" - dbm "github.com/cometbft/cometbft-db" tmcfg "github.com/cometbft/cometbft/config" "github.com/cometbft/cometbft/libs/log" + dbm "github.com/cosmos/cosmos-db" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/simapp/test_helpers.go b/simapp/test_helpers.go index de9cc9cd919a..2cd87d044089 100644 --- a/simapp/test_helpers.go +++ b/simapp/test_helpers.go @@ -6,12 +6,12 @@ import ( "os" "testing" - dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" tmjson "github.com/cometbft/cometbft/libs/json" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" tmtypes "github.com/cometbft/cometbft/types" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" "cosmossdk.io/math" diff --git a/snapshots/helpers_test.go b/snapshots/helpers_test.go index 2167fdf78f2b..5e05c1c9a9f1 100644 --- a/snapshots/helpers_test.go +++ b/snapshots/helpers_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - db "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" + db "github.com/cosmos/cosmos-db" protoio "github.com/cosmos/gogoproto/io" "github.com/stretchr/testify/require" diff --git a/snapshots/manager_test.go b/snapshots/manager_test.go index 2e101fbc825e..1f727e1e2f92 100644 --- a/snapshots/manager_test.go +++ b/snapshots/manager_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - db "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" + db "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/snapshots/store.go b/snapshots/store.go index 1087c826fab2..1d224bf02a1d 100644 --- a/snapshots/store.go +++ b/snapshots/store.go @@ -11,7 +11,7 @@ import ( "strconv" "sync" - db "github.com/cometbft/cometbft-db" + db "github.com/cosmos/cosmos-db" "github.com/cosmos/gogoproto/proto" "github.com/cosmos/cosmos-sdk/snapshots/types" diff --git a/snapshots/store_test.go b/snapshots/store_test.go index ea79f5d7657b..7b963872c667 100644 --- a/snapshots/store_test.go +++ b/snapshots/store_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - db "github.com/cometbft/cometbft-db" + db "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/store/cachekv/benchmark_test.go b/store/cachekv/benchmark_test.go index 3a941d143699..876e73111981 100644 --- a/store/cachekv/benchmark_test.go +++ b/store/cachekv/benchmark_test.go @@ -4,7 +4,7 @@ import ( fmt "fmt" "testing" - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/store" diff --git a/store/cachekv/store.go b/store/cachekv/store.go index a8f468979cd9..7046504e78d8 100644 --- a/store/cachekv/store.go +++ b/store/cachekv/store.go @@ -6,8 +6,8 @@ import ( "sort" "sync" - dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/math" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/internal/conv" "github.com/cosmos/cosmos-sdk/store/cachekv/internal" diff --git a/store/cachekv/store_bench_test.go b/store/cachekv/store_bench_test.go index 31a7370b15b7..8a1e364e80d6 100644 --- a/store/cachekv/store_bench_test.go +++ b/store/cachekv/store_bench_test.go @@ -3,7 +3,7 @@ package cachekv_test import ( "testing" - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/store/cachekv" "github.com/cosmos/cosmos-sdk/store/dbadapter" diff --git a/store/cachekv/store_test.go b/store/cachekv/store_test.go index be591ec7bee4..20d6088baeb6 100644 --- a/store/cachekv/store_test.go +++ b/store/cachekv/store_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - dbm "github.com/cometbft/cometbft-db" tmrand "github.com/cometbft/cometbft/libs/rand" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" "github.com/cosmos/cosmos-sdk/store/cachekv" diff --git a/store/cachemulti/store.go b/store/cachemulti/store.go index 86927466a905..c1212d33e4f3 100644 --- a/store/cachemulti/store.go +++ b/store/cachemulti/store.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/store/cachekv" "github.com/cosmos/cosmos-sdk/store/dbadapter" diff --git a/store/dbadapter/store.go b/store/dbadapter/store.go index b3dc99847ce9..5991644f252a 100644 --- a/store/dbadapter/store.go +++ b/store/dbadapter/store.go @@ -3,7 +3,7 @@ package dbadapter import ( "io" - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/store/cachekv" "github.com/cosmos/cosmos-sdk/store/tracekv" diff --git a/store/gaskv/store_test.go b/store/gaskv/store_test.go index 2aabc9de7c2f..fbc4787db7c7 100644 --- a/store/gaskv/store_test.go +++ b/store/gaskv/store_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" "github.com/cosmos/cosmos-sdk/store/dbadapter" diff --git a/store/listenkv/store_test.go b/store/listenkv/store_test.go index e25ac40527b7..15c99aaa4b6d 100644 --- a/store/listenkv/store_test.go +++ b/store/listenkv/store_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" ) func bz(s string) []byte { return []byte(s) } diff --git a/store/mem/store.go b/store/mem/store.go index bba5fde8d0d9..31e0bba5b148 100644 --- a/store/mem/store.go +++ b/store/mem/store.go @@ -3,7 +3,7 @@ package mem import ( "io" - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/store/cachekv" "github.com/cosmos/cosmos-sdk/store/dbadapter" diff --git a/store/pruning/manager.go b/store/pruning/manager.go index e159f909510a..95420be16130 100644 --- a/store/pruning/manager.go +++ b/store/pruning/manager.go @@ -6,8 +6,8 @@ import ( "fmt" "sync" - dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/store/pruning/types" ) diff --git a/store/pruning/manager_test.go b/store/pruning/manager_test.go index f7f71b9cfe4a..9a8b77d813cc 100644 --- a/store/pruning/manager_test.go +++ b/store/pruning/manager_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - db "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" + db "github.com/cosmos/cosmos-db" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" diff --git a/store/pruning/mock/db_mock.go b/store/pruning/mock/db_mock.go index 72c8c99fdae3..45e0c35c2b62 100644 --- a/store/pruning/mock/db_mock.go +++ b/store/pruning/mock/db_mock.go @@ -8,7 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - db "github.com/cometbft/cometbft-db" + db "github.com/cosmos/cosmos-db" ) // MockDB is a mock of DB interface. diff --git a/store/rootmulti/proof_test.go b/store/rootmulti/proof_test.go index f1d1bca250ca..647a4c485910 100644 --- a/store/rootmulti/proof_test.go +++ b/store/rootmulti/proof_test.go @@ -3,9 +3,9 @@ package rootmulti import ( "testing" - dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" "github.com/cosmos/cosmos-sdk/store/iavl" diff --git a/store/rootmulti/snapshot_test.go b/store/rootmulti/snapshot_test.go index cd76678d30d5..58927547e05b 100644 --- a/store/rootmulti/snapshot_test.go +++ b/store/rootmulti/snapshot_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/snapshots" snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types" "github.com/cosmos/cosmos-sdk/store/iavl" diff --git a/store/rootmulti/store.go b/store/rootmulti/store.go index 79865502a33c..e91d9907cc07 100644 --- a/store/rootmulti/store.go +++ b/store/rootmulti/store.go @@ -8,10 +8,10 @@ import ( "strings" "sync" - dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + dbm "github.com/cosmos/cosmos-db" protoio "github.com/cosmos/gogoproto/io" gogotypes "github.com/cosmos/gogoproto/types" iavltree "github.com/cosmos/iavl" @@ -64,7 +64,6 @@ type Store struct { storesParams map[types.StoreKey]storeParams stores map[types.StoreKey]types.CommitKVStore keysByName map[string]types.StoreKey - lazyLoading bool initialVersion int64 removalMap map[types.StoreKey]bool traceWriter io.Writer @@ -125,11 +124,6 @@ func (rs *Store) SetIAVLDisableFastNode(disableFastNode bool) { rs.iavlDisableFastNode = disableFastNode } -// SetLazyLoading sets if the iavl store should be loaded lazily or not -func (rs *Store) SetLazyLoading(lazyLoading bool) { - rs.lazyLoading = lazyLoading -} - // GetStoreType implements Store. func (rs *Store) GetStoreType() types.StoreType { return types.StoreTypeMulti diff --git a/store/rootmulti/store_test.go b/store/rootmulti/store_test.go index 41ee371b2b00..df565e21cc7d 100644 --- a/store/rootmulti/store_test.go +++ b/store/rootmulti/store_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" "github.com/cosmos/cosmos-sdk/codec" diff --git a/store/store.go b/store/store.go index d70ad54ee4d6..80239fd6aa08 100644 --- a/store/store.go +++ b/store/store.go @@ -1,8 +1,8 @@ package store import ( - dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/store/cache" "github.com/cosmos/cosmos-sdk/store/rootmulti" diff --git a/store/streaming/constructor_test.go b/store/streaming/constructor_test.go index ea00c05bbcb7..d3635c6a54b2 100644 --- a/store/streaming/constructor_test.go +++ b/store/streaming/constructor_test.go @@ -3,8 +3,8 @@ package streaming_test import ( "testing" - dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" "github.com/cosmos/cosmos-sdk/baseapp" diff --git a/store/tracekv/store_test.go b/store/tracekv/store_test.go index 88d7aab5e43d..dfe1751f52fd 100644 --- a/store/tracekv/store_test.go +++ b/store/tracekv/store_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/store/dbadapter" "github.com/cosmos/cosmos-sdk/store/prefix" diff --git a/store/transient/store.go b/store/transient/store.go index 531cd8e25ca7..1afce703192a 100644 --- a/store/transient/store.go +++ b/store/transient/store.go @@ -1,7 +1,7 @@ package transient import ( - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/store/dbadapter" pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" diff --git a/store/types/iterator_test.go b/store/types/iterator_test.go index 2e22e8aa6af0..6e31f0ea80e2 100644 --- a/store/types/iterator_test.go +++ b/store/types/iterator_test.go @@ -3,8 +3,8 @@ package types_test import ( "testing" - dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + dbm "github.com/cosmos/cosmos-db" + "cosmossdk.io/log" "github.com/stretchr/testify/require" "github.com/cosmos/cosmos-sdk/store/iavl" @@ -13,7 +13,7 @@ import ( func newMemTestKVStore(t *testing.T) types.KVStore { db := dbm.NewMemDB() - store, err := iavl.LoadStore(db, log.NewNopLogger(), types.NewKVStoreKey("test"), types.CommitID{}, false, iavl.DefaultIAVLCacheSize, false) + store, err := iavl.LoadStore(db, log.NewNopLogger(), types.NewKVStoreKey("test"), types.CommitID{}, iavl.DefaultIAVLCacheSize, false) require.NoError(t, err) return store } diff --git a/store/types/utils_test.go b/store/types/utils_test.go index e4738193ebb8..f266cbf5580e 100644 --- a/store/types/utils_test.go +++ b/store/types/utils_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" "github.com/cosmos/cosmos-sdk/store/rootmulti" diff --git a/tests/e2e/params/suite.go b/tests/e2e/params/suite.go index bd4f45c94f2d..348dfda77389 100644 --- a/tests/e2e/params/suite.go +++ b/tests/e2e/params/suite.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/suite" "cosmossdk.io/depinject" diff --git a/tests/e2e/server/export_test.go b/tests/e2e/server/export_test.go index f333cd9c5c97..7e39506e48da 100644 --- a/tests/e2e/server/export_test.go +++ b/tests/e2e/server/export_test.go @@ -15,12 +15,12 @@ import ( "github.com/spf13/cobra" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" tmjson "github.com/cometbft/cometbft/libs/json" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" tmtypes "github.com/cometbft/cometbft/types" + dbm "github.com/cosmos/cosmos-db" "cosmossdk.io/simapp" "github.com/cosmos/cosmos-sdk/client" diff --git a/tests/integration/gov/module_test.go b/tests/integration/gov/module_test.go index ef11534151b6..d0885b769a4a 100644 --- a/tests/integration/gov/module_test.go +++ b/tests/integration/gov/module_test.go @@ -3,11 +3,11 @@ package gov_test import ( "testing" - dbm "github.com/cometbft/cometbft-db" abcitypes "github.com/cometbft/cometbft/abci/types" tmjson "github.com/cometbft/cometbft/libs/json" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" "cosmossdk.io/simapp" diff --git a/tests/integration/store/rootmulti/rollback_test.go b/tests/integration/store/rootmulti/rollback_test.go index ef0502168f54..800e688e76ea 100644 --- a/tests/integration/store/rootmulti/rollback_test.go +++ b/tests/integration/store/rootmulti/rollback_test.go @@ -5,10 +5,10 @@ import ( "testing" "cosmossdk.io/simapp" - dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + dbm "github.com/cosmos/cosmos-db" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" "github.com/stretchr/testify/require" ) diff --git a/testutil/context.go b/testutil/context.go index 7c99b699ab25..746dbcadfea1 100644 --- a/testutil/context.go +++ b/testutil/context.go @@ -3,9 +3,9 @@ package testutil import ( "testing" - dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/assert" "github.com/cosmos/cosmos-sdk/store" diff --git a/testutil/mock/tendermint_tm_db_DB.go b/testutil/mock/tendermint_tm_db_DB.go index 2e6b67d8ae6f..e2ff6306a409 100644 --- a/testutil/mock/tendermint_tm_db_DB.go +++ b/testutil/mock/tendermint_tm_db_DB.go @@ -7,7 +7,7 @@ package mock import ( reflect "reflect" - db "github.com/cometbft/cometbft-db" + db "github.com/cosmos/cosmos-db" gomock "github.com/golang/mock/gomock" ) diff --git a/testutil/network/network.go b/testutil/network/network.go index 0724a97f3b3a..edbc91e339f1 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -15,10 +15,10 @@ import ( "testing" "time" - dbm "github.com/cometbft/cometbft-db" tmrand "github.com/cometbft/cometbft/libs/rand" "github.com/cometbft/cometbft/node" tmclient "github.com/cometbft/cometbft/rpc/client" + dbm "github.com/cosmos/cosmos-db" "github.com/spf13/cobra" "google.golang.org/grpc" diff --git a/testutil/sims/app_helpers.go b/testutil/sims/app_helpers.go index f6cd882a680e..c59c2951b9b3 100644 --- a/testutil/sims/app_helpers.go +++ b/testutil/sims/app_helpers.go @@ -5,12 +5,12 @@ import ( "fmt" "time" - dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" tmjson "github.com/cometbft/cometbft/libs/json" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" tmtypes "github.com/cometbft/cometbft/types" + dbm "github.com/cosmos/cosmos-db" "cosmossdk.io/depinject" "cosmossdk.io/math" diff --git a/testutil/sims/simulation_helpers.go b/testutil/sims/simulation_helpers.go index 471944f4d15d..754e2f77a9af 100644 --- a/testutil/sims/simulation_helpers.go +++ b/testutil/sims/simulation_helpers.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/runtime" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/types/query/pagination.go b/types/query/pagination.go index 0c670b50e6c3..0636895da718 100644 --- a/types/query/pagination.go +++ b/types/query/pagination.go @@ -4,7 +4,7 @@ import ( "fmt" "math" - db "github.com/cometbft/cometbft-db" + db "github.com/cosmos/cosmos-db" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/types/store_test.go b/types/store_test.go index 2d2bc636d4f2..461d83deeb50 100644 --- a/types/store_test.go +++ b/types/store_test.go @@ -3,8 +3,8 @@ package types_test import ( "testing" - dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/suite" "github.com/cosmos/cosmos-sdk/store/rootmulti" diff --git a/x/group/internal/orm/testsupport.go b/x/group/internal/orm/testsupport.go index f4878d265bd2..891eab2f3c18 100644 --- a/x/group/internal/orm/testsupport.go +++ b/x/group/internal/orm/testsupport.go @@ -3,7 +3,7 @@ package orm import ( "fmt" - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/store" "github.com/cosmos/cosmos-sdk/store/gaskv" storetypes "github.com/cosmos/cosmos-sdk/store/types" diff --git a/x/group/keeper/invariants_test.go b/x/group/keeper/invariants_test.go index dd22f93d3a89..16c224d54d76 100644 --- a/x/group/keeper/invariants_test.go +++ b/x/group/keeper/invariants_test.go @@ -6,8 +6,8 @@ import ( "github.com/cometbft/cometbft/libs/log" "github.com/stretchr/testify/suite" - dbm "github.com/cometbft/cometbft-db" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/x/params/types/subspace_test.go b/x/params/types/subspace_test.go index 6449fcb99206..3c8ff77b6a77 100644 --- a/x/params/types/subspace_test.go +++ b/x/params/types/subspace_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/suite" "cosmossdk.io/depinject" diff --git a/x/upgrade/types/storeloader_test.go b/x/upgrade/types/storeloader_test.go index e0b8f569f616..39ddae790744 100644 --- a/x/upgrade/types/storeloader_test.go +++ b/x/upgrade/types/storeloader_test.go @@ -6,11 +6,11 @@ import ( "path/filepath" "testing" - dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" tmlog "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" "github.com/cosmos/cosmos-sdk/baseapp"