diff --git a/app/app.go b/app/app.go index baeb5df62b..62dfb5a631 100644 --- a/app/app.go +++ b/app/app.go @@ -95,6 +95,7 @@ import ( // Note: please do your research before using this in production app, this is a demo and not an officially // supported IBC team implementation. It has no known issues, but do your own research before using it. + dbm "github.com/cosmos/cosmos-db" storetypes "github.com/cosmos/cosmos-sdk/store/types" intertx "github.com/cosmos/interchain-accounts/x/inter-tx" intertxkeeper "github.com/cosmos/interchain-accounts/x/inter-tx/keeper" @@ -107,7 +108,6 @@ import ( "github.com/tendermint/tendermint/libs/log" tmos "github.com/tendermint/tendermint/libs/os" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" wasmappparams "github.com/CosmWasm/wasmd/app/params" "github.com/CosmWasm/wasmd/x/wasm" diff --git a/app/app_test.go b/app/app_test.go index 46f0725262..23bcf45e7f 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -6,6 +6,7 @@ import ( "testing" "time" + db "github.com/cosmos/cosmos-db" codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" @@ -18,7 +19,6 @@ import ( "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/libs/log" tmtypes "github.com/tendermint/tendermint/types" - db "github.com/tendermint/tm-db" abci "github.com/tendermint/tendermint/abci/types" diff --git a/app/sim_test.go b/app/sim_test.go index 925bc03ec5..31e9cd94e6 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -11,6 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/store" "github.com/cosmos/cosmos-sdk/store/prefix" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/simapp" @@ -37,7 +38,6 @@ import ( "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/libs/log" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/CosmWasm/wasmd/x/wasm" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" diff --git a/app/test_helpers.go b/app/test_helpers.go index 6c2e8133cb..20952d642d 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -12,6 +12,7 @@ import ( "time" "cosmossdk.io/math" + dbm "github.com/cosmos/cosmos-db" bam "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" codectypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -33,7 +34,6 @@ import ( "github.com/tendermint/tendermint/libs/log" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtypes "github.com/tendermint/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/CosmWasm/wasmd/x/wasm" ) diff --git a/benchmarks/app_test.go b/benchmarks/app_test.go index 6a1c98dda3..99538cc2f2 100644 --- a/benchmarks/app_test.go +++ b/benchmarks/app_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/require" + dbm "github.com/cosmos/cosmos-db" abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/libs/log" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtypes "github.com/tendermint/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/simapp/helpers" diff --git a/benchmarks/bench_test.go b/benchmarks/bench_test.go index 0cd181f5d1..9f8198d45d 100644 --- a/benchmarks/bench_test.go +++ b/benchmarks/bench_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" "github.com/syndtr/goleveldb/leveldb/opt" + dbm "github.com/cosmos/cosmos-db" abci "github.com/tendermint/tendermint/abci/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/cmd/wasmd/root.go b/cmd/wasmd/root.go index 5a6e6accf1..ca0b3db74c 100644 --- a/cmd/wasmd/root.go +++ b/cmd/wasmd/root.go @@ -6,6 +6,7 @@ import ( "os" "path/filepath" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/config" @@ -31,7 +32,6 @@ import ( tmcfg "github.com/tendermint/tendermint/config" tmcli "github.com/tendermint/tendermint/libs/cli" "github.com/tendermint/tendermint/libs/log" - dbm "github.com/tendermint/tm-db" "github.com/CosmWasm/wasmd/app" "github.com/CosmWasm/wasmd/app/params" diff --git a/go.mod b/go.mod index 5505377442..f04d86a1fa 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( cosmossdk.io/errors v1.0.0-beta.7 cosmossdk.io/math v1.0.0-beta.3 github.com/CosmWasm/wasmvm v1.0.0 + github.com/cosmos/cosmos-db v0.0.0-20220901120321-77d98dabb5d3 github.com/cosmos/cosmos-sdk v0.46.1 github.com/cosmos/iavl v0.19.2-0.20220831121246-807f8c542e48 github.com/cosmos/ibc-go/v5 v5.0.0-rc1 @@ -28,7 +29,6 @@ require ( github.com/stretchr/testify v1.8.0 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 github.com/tendermint/tendermint v0.34.21 - github.com/tendermint/tm-db v0.6.7 google.golang.org/genproto v0.0.0-20220725144611-272f38e5d71b google.golang.org/grpc v1.49.0 gopkg.in/yaml.v2 v2.4.0 @@ -63,7 +63,6 @@ require ( github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect github.com/confio/ics23/go v0.7.0 // indirect github.com/cosmos/btcutil v1.0.4 // indirect - github.com/cosmos/cosmos-db v0.0.0-20220901120321-77d98dabb5d3 // indirect github.com/cosmos/cosmos-proto v1.0.0-alpha7 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gorocksdb v1.2.0 // indirect @@ -143,6 +142,7 @@ require ( github.com/tendermint/btcd v0.1.1 // indirect github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect github.com/tendermint/go-amino v0.16.0 // indirect + github.com/tendermint/tm-db v0.6.7 // indirect github.com/ulikunitz/xz v0.5.8 // indirect github.com/zondax/hid v0.9.1-0.20220302062450-5552068d2266 // indirect go.etcd.io/bbolt v1.3.6 // indirect diff --git a/x/wasm/keeper/ante_test.go b/x/wasm/keeper/ante_test.go index e96332c9fe..092b1aa397 100644 --- a/x/wasm/keeper/ante_test.go +++ b/x/wasm/keeper/ante_test.go @@ -8,6 +8,7 @@ import ( "github.com/CosmWasm/wasmd/x/wasm/keeper" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/store" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -15,7 +16,6 @@ import ( "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/libs/log" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/CosmWasm/wasmd/x/wasm/types" ) diff --git a/x/wasm/keeper/bench_test.go b/x/wasm/keeper/bench_test.go index 1ad1693bb5..cfed0f2bdc 100644 --- a/x/wasm/keeper/bench_test.go +++ b/x/wasm/keeper/bench_test.go @@ -4,9 +4,9 @@ import ( "os" "testing" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" "github.com/stretchr/testify/require" - dbm "github.com/tendermint/tm-db" "github.com/CosmWasm/wasmd/x/wasm/types" ) diff --git a/x/wasm/keeper/genesis_test.go b/x/wasm/keeper/genesis_test.go index 001e4c5edc..e3e99be1aa 100644 --- a/x/wasm/keeper/genesis_test.go +++ b/x/wasm/keeper/genesis_test.go @@ -11,6 +11,7 @@ import ( "testing" "time" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/store" "github.com/cosmos/cosmos-sdk/store/prefix" storetypes "github.com/cosmos/cosmos-sdk/store/types" @@ -28,7 +29,6 @@ import ( "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/proto/tendermint/crypto" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/CosmWasm/wasmd/x/wasm/types" wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types" diff --git a/x/wasm/keeper/query_plugins_test.go b/x/wasm/keeper/query_plugins_test.go index 555521d68f..e64a1a9595 100644 --- a/x/wasm/keeper/query_plugins_test.go +++ b/x/wasm/keeper/query_plugins_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "testing" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/store" - dbm "github.com/tendermint/tm-db" wasmvmtypes "github.com/CosmWasm/wasmvm/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/wasm/keeper/test_common.go b/x/wasm/keeper/test_common.go index b1d6edcb40..2909429002 100644 --- a/x/wasm/keeper/test_common.go +++ b/x/wasm/keeper/test_common.go @@ -10,6 +10,7 @@ import ( "github.com/CosmWasm/wasmd/x/wasm/keeper/testdata" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/std" @@ -70,7 +71,6 @@ import ( "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/libs/rand" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" wasmappparams "github.com/CosmWasm/wasmd/app/params" diff --git a/x/wasm/types/iavl_range_test.go b/x/wasm/types/iavl_range_test.go index 1e5bdc92ab..2d6472b986 100644 --- a/x/wasm/types/iavl_range_test.go +++ b/x/wasm/types/iavl_range_test.go @@ -3,11 +3,11 @@ package types import ( "testing" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/store" "github.com/cosmos/cosmos-sdk/store/iavl" iavl2 "github.com/cosmos/iavl" "github.com/stretchr/testify/require" - dbm "github.com/tendermint/tm-db" ) // This is modeled close to