From 8d271abccf7cdc0831e9cbf5c75fe760c6a3fbc1 Mon Sep 17 00:00:00 2001 From: Ilya Kapitonau Date: Wed, 20 Mar 2024 17:45:18 +0400 Subject: [PATCH] Fix imports in tests --- go.mod | 2 +- go.sum | 4 ++-- x/compute/internal/keeper/bench_test.go | 2 +- x/compute/internal/keeper/ibc_test.go | 6 +++--- x/compute/internal/keeper/keeper_test.go | 2 +- x/compute/internal/keeper/querier_test.go | 2 +- x/compute/internal/keeper/recurse_test.go | 2 +- x/compute/internal/keeper/secret_contracts_exec_test.go | 6 +++--- x/compute/internal/keeper/secret_contracts_migrate_test.go | 6 +++--- x/compute/internal/keeper/secret_contracts_utils_test.go | 6 +++--- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index 8832a5227..e32e7ebd7 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21 replace ( github.com/cometbft/cometbft => github.com/scrtlabs/tendermint v0.38.2 - github.com/cosmos/cosmos-sdk => github.com/scrtlabs/cosmos-sdk v0.46.0-beta2.0.20240220141806-c50382d54491 + github.com/cosmos/cosmos-sdk => github.com/scrtlabs/cosmos-sdk v0.46.0-beta2.0.20240319223406-51e8978ed8d6 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 ) diff --git a/go.sum b/go.sum index c35b06b53..e98dc1c5e 100644 --- a/go.sum +++ b/go.sum @@ -945,8 +945,8 @@ github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWR github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= -github.com/scrtlabs/cosmos-sdk v0.46.0-beta2.0.20240220141806-c50382d54491 h1:yqm1xFN69OqyOigbO6F7LOWhdS0q8F9ZHPvMwOTC7d4= -github.com/scrtlabs/cosmos-sdk v0.46.0-beta2.0.20240220141806-c50382d54491/go.mod h1:ehEJ6NYUAKWxVGMczCoQJ9XXbEURe1T8KG7mL5PAMok= +github.com/scrtlabs/cosmos-sdk v0.46.0-beta2.0.20240319223406-51e8978ed8d6 h1:X2vkCDte8W+UVJCPQziSSpQ0+v8eQ5+3lvK6hgm6qMc= +github.com/scrtlabs/cosmos-sdk v0.46.0-beta2.0.20240319223406-51e8978ed8d6/go.mod h1:ehEJ6NYUAKWxVGMczCoQJ9XXbEURe1T8KG7mL5PAMok= github.com/scrtlabs/tendermint v0.38.2 h1:a2L2v70guPMvQNbr38Cl5jwuLRBJim1iznBV+4x7fyU= github.com/scrtlabs/tendermint v0.38.2/go.mod h1:FbzZXk9nkr7atxsGcBn6tlM6Q+BD4GA6wlgY5Qk3FzQ= github.com/scrtlabs/tm-secret-enclave v1.11.3 h1:3WVDS4x11tidRvCK/FbemtuVDMgujvSzMSt9sKLaMwY= diff --git a/x/compute/internal/keeper/bench_test.go b/x/compute/internal/keeper/bench_test.go index be54ab0c6..a33c65d85 100644 --- a/x/compute/internal/keeper/bench_test.go +++ b/x/compute/internal/keeper/bench_test.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec/legacy" crypto "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx" + "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" "gonum.org/v1/gonum/stat" "github.com/stretchr/testify/require" diff --git a/x/compute/internal/keeper/ibc_test.go b/x/compute/internal/keeper/ibc_test.go index 0d9133844..eba1331b7 100644 --- a/x/compute/internal/keeper/ibc_test.go +++ b/x/compute/internal/keeper/ibc_test.go @@ -16,10 +16,10 @@ import ( v1types "github.com/scrtlabs/SecretNetwork/go-cosmwasm/types/v1" "github.com/scrtlabs/SecretNetwork/x/compute/internal/types" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" + "github.com/cometbft/cometbft/libs/log" - ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - ibcchanneltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" + ibcchanneltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" ) const defaultGasForIbcTests = 600_000 diff --git a/x/compute/internal/keeper/keeper_test.go b/x/compute/internal/keeper/keeper_test.go index a1e56642b..be9ece141 100644 --- a/x/compute/internal/keeper/keeper_test.go +++ b/x/compute/internal/keeper/keeper_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - stypes "github.com/cosmos/cosmos-sdk/store/types" + stypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" authante "github.com/cosmos/cosmos-sdk/x/auth/ante" "github.com/scrtlabs/SecretNetwork/go-cosmwasm/api" diff --git a/x/compute/internal/keeper/querier_test.go b/x/compute/internal/keeper/querier_test.go index d0f469f9c..768e24553 100644 --- a/x/compute/internal/keeper/querier_test.go +++ b/x/compute/internal/keeper/querier_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkErrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/compute/internal/keeper/recurse_test.go b/x/compute/internal/keeper/recurse_test.go index fabc1cd49..2122b7d7e 100644 --- a/x/compute/internal/keeper/recurse_test.go +++ b/x/compute/internal/keeper/recurse_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/compute/internal/keeper/secret_contracts_exec_test.go b/x/compute/internal/keeper/secret_contracts_exec_test.go index a5f4df2b1..de75cd090 100644 --- a/x/compute/internal/keeper/secret_contracts_exec_test.go +++ b/x/compute/internal/keeper/secret_contracts_exec_test.go @@ -25,9 +25,9 @@ import ( crypto "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" - ibctransfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" - ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - ibcchanneltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" + ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" + ibcchanneltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" ) func setupChainTest(t *testing.T, wasmPath string, additionalCoinsInWallets sdk.Coins, amount uint64) (sdk.Context, Keeper, []uint64, []string, sdk.AccAddress, crypto.PrivKey, sdk.AccAddress, crypto.PrivKey) { diff --git a/x/compute/internal/keeper/secret_contracts_migrate_test.go b/x/compute/internal/keeper/secret_contracts_migrate_test.go index fd494d1a7..219170bdc 100644 --- a/x/compute/internal/keeper/secret_contracts_migrate_test.go +++ b/x/compute/internal/keeper/secret_contracts_migrate_test.go @@ -21,9 +21,9 @@ import ( cosmwasm "github.com/scrtlabs/SecretNetwork/go-cosmwasm/types" "github.com/stretchr/testify/require" - ibctransfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" - ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - ibcchanneltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" + ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" + ibcchanneltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" ) type MigrateTestContract struct { diff --git a/x/compute/internal/keeper/secret_contracts_utils_test.go b/x/compute/internal/keeper/secret_contracts_utils_test.go index b9c8460c1..a03cf0659 100644 --- a/x/compute/internal/keeper/secret_contracts_utils_test.go +++ b/x/compute/internal/keeper/secret_contracts_utils_test.go @@ -15,12 +15,12 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - stypes "github.com/cosmos/cosmos-sdk/store/types" - abci "github.com/tendermint/tendermint/abci/types" + stypes "cosmossdk.io/store/types" + abci "github.com/cometbft/cometbft/abci/types" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" + "github.com/cometbft/cometbft/libs/log" crypto "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types"