diff --git a/benchmark/app_test.go b/benchmark/app_test.go index 251507f1..91ca9607 100644 --- a/benchmark/app_test.go +++ b/benchmark/app_test.go @@ -7,13 +7,13 @@ import ( //"github.com/cometbft/cometbft/libs/rand" - dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" "github.com/stretchr/testify/require" simappparams "cosmossdk.io/simapp/params" vmtypes "github.com/initia-labs/initiavm/types" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" diff --git a/benchmark/block_test.go b/benchmark/block_test.go index 1cbbafcd..efcfc637 100644 --- a/benchmark/block_test.go +++ b/benchmark/block_test.go @@ -4,15 +4,13 @@ import ( "bytes" "testing" - dbm "github.com/cometbft/cometbft-db" movetypes "github.com/initia-labs/initia/x/move/types" vmtypes "github.com/initia-labs/initiavm/types" "github.com/stretchr/testify/require" "github.com/syndtr/goleveldb/leveldb/opt" - "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" + dbm "github.com/cosmos/cosmos-db" sdk "github.com/cosmos/cosmos-sdk/types" - banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" ) var transferAmount, _ = vmtypes.SerializeUint64(100) @@ -125,9 +123,9 @@ func buildLevelDB(b *testing.B) dbm.DB { return levelDB } -func bankSendMsg(info *AppInfo, _ int) ([]sdk.Msg, error) { - rcpt := sdk.AccAddress(secp256k1.GenPrivKey().PubKey().Address()) - coins := sdk.Coins{sdk.NewInt64Coin(info.Denom, 100)} - sendMsg := banktypes.NewMsgSend(info.MinterAddr, rcpt, coins) - return []sdk.Msg{sendMsg}, nil -} +// func bankSendMsg(info *AppInfo, _ int) ([]sdk.Msg, error) { +// rcpt := sdk.AccAddress(secp256k1.GenPrivKey().PubKey().Address()) +// coins := sdk.Coins{sdk.NewInt64Coin(info.Denom, 100)} +// sendMsg := banktypes.NewMsgSend(info.MinterAddr, rcpt, coins) +// return []sdk.Msg{sendMsg}, nil +// } diff --git a/benchmark/transaction_test.go b/benchmark/transaction_test.go index d0cd9abf..b747785f 100644 --- a/benchmark/transaction_test.go +++ b/benchmark/transaction_test.go @@ -3,13 +3,10 @@ package benchmarks import ( "testing" - // "fmt" - "github.com/stretchr/testify/require" + dbm "github.com/cosmos/cosmos-db" sdk "github.com/cosmos/cosmos-sdk/types" - - dbm "github.com/cometbft/cometbft-db" ) func BenchmarkTPS(b *testing.B) { diff --git a/go.mod b/go.mod index fdf0e414..f465fdee 100644 --- a/go.mod +++ b/go.mod @@ -21,10 +21,10 @@ require ( github.com/IGLOU-EU/go-wildcard v1.0.3 github.com/bits-and-blooms/bitset v1.8.0 github.com/cometbft/cometbft v0.38.2 - github.com/cometbft/cometbft-db v0.9.1 github.com/cosmos/cosmos-db v1.0.0 github.com/cosmos/cosmos-proto v1.0.0-beta.3 github.com/cosmos/cosmos-sdk v0.50.2 + github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/gogoproto v1.4.11 github.com/cosmos/ibc-go/modules/capability v1.0.0 github.com/cosmos/ibc-go/v8 v8.0.0 @@ -56,8 +56,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 ) -require github.com/cosmos/go-bip39 v1.0.0 - require ( cloud.google.com/go v0.110.9 // indirect cloud.google.com/go/compute v1.23.2 // indirect @@ -85,6 +83,7 @@ require ( github.com/cockroachdb/pebble v0.0.0-20231102162011-844f0582c2eb // indirect github.com/cockroachdb/redact v1.1.5 // indirect github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect + github.com/cometbft/cometbft-db v0.9.1 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/iavl v1.0.0 // indirect diff --git a/x/ibc/testing/README.md b/x/ibc/testing/README.md index 9c916818..2647d09a 100644 --- a/x/ibc/testing/README.md +++ b/x/ibc/testing/README.md @@ -259,7 +259,7 @@ import ( "encoding/json" "github.com/cometbft/cometbft/libs/log" - dbm "github.com/cometbft/cometbft-db" + dbm "github.com/cosmos/cosmos-db" <<<<<<< Updated upstream "github.com/cosmos/ibc-go/v8/modules/apps/transfer/simapp"