From 67a6a25850385dd457e2f97082f817cdae66a8f8 Mon Sep 17 00:00:00 2001 From: Spoorthi Satheesha <9302666+spoo-bar@users.noreply.github.com> Date: Tue, 29 Aug 2023 14:20:42 +0530 Subject: [PATCH] bumping ibc-go refs --- app/ante.go | 4 +-- app/app.go | 40 ++++++++++++++-------------- app/sim_test.go | 34 +++++++++++------------ app/test_access.go | 4 +-- app/upgrades/06/upgrades.go | 2 +- app/upgrades/2_0_0/upgrades.go | 8 +++--- e2e/common_voter_test.go | 2 +- e2e/testing/chain.go | 2 +- e2e/testing/chain_ops_ibc.go | 12 ++++----- e2e/testing/ibc_path.go | 14 +++++----- e2e/voter_test.go | 2 +- interchaintest/chain_upgrade_test.go | 8 +++--- 12 files changed, 66 insertions(+), 66 deletions(-) diff --git a/app/ante.go b/app/ante.go index e1111173..7653e12b 100644 --- a/app/ante.go +++ b/app/ante.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/auth/ante" - ibcante "github.com/cosmos/ibc-go/v4/modules/core/ante" - ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper" + ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante" + ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" rewardsAnte "github.com/archway-network/archway/x/rewards/ante" rewardsKeeper "github.com/archway-network/archway/x/rewards/keeper" diff --git a/app/app.go b/app/app.go index b7f743a3..d547d12f 100644 --- a/app/app.go +++ b/app/app.go @@ -28,7 +28,7 @@ import ( "github.com/cosmos/cosmos-sdk/server/api" "github.com/cosmos/cosmos-sdk/server/config" servertypes "github.com/cosmos/cosmos-sdk/server/types" - "github.com/cosmos/cosmos-sdk/simapp" + "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/version" @@ -86,24 +86,24 @@ import ( upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - ica "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts" - icahost "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host" - icahostkeeper "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/keeper" - icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types" - icatypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types" - ibcfee "github.com/cosmos/ibc-go/v4/modules/apps/29-fee" - ibcfeekeeper "github.com/cosmos/ibc-go/v4/modules/apps/29-fee/keeper" - ibcfeetypes "github.com/cosmos/ibc-go/v4/modules/apps/29-fee/types" - "github.com/cosmos/ibc-go/v4/modules/apps/transfer" - ibctransferkeeper "github.com/cosmos/ibc-go/v4/modules/apps/transfer/keeper" - ibctransfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" - ibc "github.com/cosmos/ibc-go/v4/modules/core" - ibcclient "github.com/cosmos/ibc-go/v4/modules/core/02-client" - ibcclientclient "github.com/cosmos/ibc-go/v4/modules/core/02-client/client" - ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - porttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types" - ibchost "github.com/cosmos/ibc-go/v4/modules/core/24-host" - ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper" + ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts" + icahost "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host" + icahostkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/keeper" + icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" + ibcfee "github.com/cosmos/ibc-go/v7/modules/apps/29-fee" + ibcfeekeeper "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/keeper" + ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" + "github.com/cosmos/ibc-go/v7/modules/apps/transfer" + ibctransferkeeper "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + ibc "github.com/cosmos/ibc-go/v7/modules/core" + ibcclient "github.com/cosmos/ibc-go/v7/modules/core/02-client" + ibcclientclient "github.com/cosmos/ibc-go/v7/modules/core/02-client/client" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" + ibchost "github.com/cosmos/ibc-go/v7/modules/core/24-host" + ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" "github.com/gorilla/mux" "github.com/rakyll/statik/fs" "github.com/spf13/cast" @@ -240,7 +240,7 @@ var ( ) var ( - _ simapp.App = (*ArchwayApp)(nil) + _ sims.App = (*ArchwayApp)(nil) _ servertypes.Application = (*ArchwayApp)(nil) ) diff --git a/app/sim_test.go b/app/sim_test.go index 6c078be9..2dca4444 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -11,7 +11,7 @@ import ( "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/baseapp" - "github.com/cosmos/cosmos-sdk/simapp" + "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" @@ -28,8 +28,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/simulation" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - ibctransfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" - ibchost "github.com/cosmos/ibc-go/v4/modules/core/24-host" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + ibchost "github.com/cosmos/ibc-go/v7/modules/core/24-host" "github.com/stretchr/testify/require" "github.com/CosmWasm/wasmd/x/wasm" @@ -38,7 +38,7 @@ import ( // Get flags every time the simulator is run func init() { - simapp.GetSimulatorFlags() + sims.GetSimulatorFlags() } type StoreKeysPrefixes struct { @@ -49,7 +49,7 @@ type StoreKeysPrefixes struct { // SetupSimulation wraps simapp.SetupSimulation in order to create any export directory if they do not exist yet func SetupSimulation(dirPrefix, dbName string) (simtypes.Config, dbm.DB, string, log.Logger, bool, error) { - config, db, dir, logger, skip, err := simapp.SetupSimulation(dirPrefix, dbName) + config, db, dir, logger, skip, err := sims.SetupSimulation(dirPrefix, dbName) if err != nil { return simtypes.Config{}, nil, "", nil, false, err } @@ -110,7 +110,7 @@ func TestAppImportExport(t *testing.T) { }() encConf := MakeEncodingConfig() - app := NewArchwayApp(logger, db, nil, true, map[int64]bool{}, dir, simapp.FlagPeriodValue, encConf, wasm.EnableAllProposals, EmptyBaseAppOptions{}, nil, fauxMerkleModeOpt) + app := NewArchwayApp(logger, db, nil, true, map[int64]bool{}, dir, sims.FlagPeriodValue, encConf, wasm.EnableAllProposals, EmptyBaseAppOptions{}, nil, fauxMerkleModeOpt) require.Equal(t, appName, app.Name()) // Run randomized simulation @@ -118,21 +118,21 @@ func TestAppImportExport(t *testing.T) { t, os.Stdout, app.BaseApp, - simapp.AppStateFn(app.AppCodec(), app.SimulationManager()), + sims.AppStateFn(app.AppCodec(), app.SimulationManager()), simtypes.RandomAccounts, - simapp.SimulationOperations(app, app.AppCodec(), config), + sims.SimulationOperations(app, app.AppCodec(), config), app.ModuleAccountAddrs(), config, app.AppCodec(), ) // export state and simParams before the simulation error is checked - err = simapp.CheckExportSimulation(app, config, simParams) + err = sims.CheckExportSimulation(app, config, simParams) require.NoError(t, err) require.NoError(t, simErr) if config.Commit { - simapp.PrintStats(db) + sims.PrintStats(db) } t.Log("exporting genesis...") @@ -149,7 +149,7 @@ func TestAppImportExport(t *testing.T) { newDB.Close() require.NoError(t, os.RemoveAll(newDir)) }() - newApp := NewArchwayApp(logger, newDB, nil, true, map[int64]bool{}, newDir, simapp.FlagPeriodValue, encConf, wasm.EnableAllProposals, EmptyBaseAppOptions{}, nil, fauxMerkleModeOpt) + newApp := NewArchwayApp(logger, newDB, nil, true, map[int64]bool{}, newDir, sims.FlagPeriodValue, encConf, wasm.EnableAllProposals, EmptyBaseAppOptions{}, nil, fauxMerkleModeOpt) require.Equal(t, appName, newApp.Name()) var genesisState GenesisState @@ -215,8 +215,8 @@ func TestFullAppSimulation(t *testing.T) { require.NoError(t, os.RemoveAll(dir)) }() encConf := MakeEncodingConfig() - app := NewArchwayApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, simapp.FlagPeriodValue, - encConf, wasm.EnableAllProposals, simapp.EmptyAppOptions{}, nil, fauxMerkleModeOpt) + app := NewArchwayApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, sims.FlagPeriodValue, + encConf, wasm.EnableAllProposals, sims.EmptyAppOptions{}, nil, fauxMerkleModeOpt) require.Equal(t, "ArchwayApp", app.Name()) // run randomized simulation @@ -224,20 +224,20 @@ func TestFullAppSimulation(t *testing.T) { t, os.Stdout, app.BaseApp, - simapp.AppStateFn(app.appCodec, app.SimulationManager()), + sims.AppStateFn(app.appCodec, app.SimulationManager()), simtypes.RandomAccounts, // Replace with own random account function if using keys other than secp256k1 - simapp.SimulationOperations(app, app.AppCodec(), config), + sims.SimulationOperations(app, app.AppCodec(), config), app.ModuleAccountAddrs(), config, app.AppCodec(), ) // export state and simParams before the simulation error is checked - err = simapp.CheckExportSimulation(app, config, simParams) + err = sims.CheckExportSimulation(app, config, simParams) require.NoError(t, err) require.NoError(t, simErr) if config.Commit { - simapp.PrintStats(db) + sims.PrintStats(db) } } diff --git a/app/test_access.go b/app/test_access.go index 9430d725..fc2b87cf 100644 --- a/app/test_access.go +++ b/app/test_access.go @@ -10,8 +10,8 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - ibctransferkeeper "github.com/cosmos/ibc-go/v4/modules/apps/transfer/keeper" - ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper" + ibctransferkeeper "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper" + ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" "github.com/CosmWasm/wasmd/x/wasm" ) diff --git a/app/upgrades/06/upgrades.go b/app/upgrades/06/upgrades.go index 64400d80..32ac1209 100644 --- a/app/upgrades/06/upgrades.go +++ b/app/upgrades/06/upgrades.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - ibcfeetypes "github.com/cosmos/ibc-go/v4/modules/apps/29-fee/types" + ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" "github.com/archway-network/archway/app/upgrades" ) diff --git a/app/upgrades/2_0_0/upgrades.go b/app/upgrades/2_0_0/upgrades.go index 28b383d2..90f96bed 100644 --- a/app/upgrades/2_0_0/upgrades.go +++ b/app/upgrades/2_0_0/upgrades.go @@ -11,10 +11,10 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - ica "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts" - icacontrollertypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/controller/types" - icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types" - icatypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types" + ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts" + icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" + icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" "github.com/archway-network/archway/app/upgrades" ) diff --git a/e2e/common_voter_test.go b/e2e/common_voter_test.go index bedc0ba6..ef238c40 100644 --- a/e2e/common_voter_test.go +++ b/e2e/common_voter_test.go @@ -14,7 +14,7 @@ import ( wasmdTypes "github.com/CosmWasm/wasmd/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - channelTypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + channelTypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" voterCustomTypes "github.com/archway-network/voter/src/pkg/archway/custom" voterState "github.com/archway-network/voter/src/state" diff --git a/e2e/testing/chain.go b/e2e/testing/chain.go index 76f77aac..e9916adc 100644 --- a/e2e/testing/chain.go +++ b/e2e/testing/chain.go @@ -26,7 +26,7 @@ import ( bankTypes "github.com/cosmos/cosmos-sdk/x/bank/types" slashingTypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingTypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/cosmos/ibc-go/v4/testing/mock" + "github.com/cosmos/ibc-go/v7/testing/mock" "github.com/golang/protobuf/proto" //nolint:staticcheck "github.com/stretchr/testify/require" diff --git a/e2e/testing/chain_ops_ibc.go b/e2e/testing/chain_ops_ibc.go index 182443fa..1e1a2b2e 100644 --- a/e2e/testing/chain_ops_ibc.go +++ b/e2e/testing/chain_ops_ibc.go @@ -13,12 +13,12 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/staking/teststaking" stakingTypes "github.com/cosmos/cosmos-sdk/x/staking/types" - clientTypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - channelTypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" - commitmentTypes "github.com/cosmos/ibc-go/v4/modules/core/23-commitment/types" - host "github.com/cosmos/ibc-go/v4/modules/core/24-host" - "github.com/cosmos/ibc-go/v4/modules/core/exported" - ibcTmTypes "github.com/cosmos/ibc-go/v4/modules/light-clients/07-tendermint/types" + clientTypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + channelTypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + commitmentTypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" + host "github.com/cosmos/ibc-go/v7/modules/core/24-host" + "github.com/cosmos/ibc-go/v7/modules/core/exported" + ibcTmTypes "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint/types" "github.com/stretchr/testify/require" ) diff --git a/e2e/testing/ibc_path.go b/e2e/testing/ibc_path.go index 00618ec5..dc55326d 100644 --- a/e2e/testing/ibc_path.go +++ b/e2e/testing/ibc_path.go @@ -7,13 +7,13 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - clientTypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" - connectionTypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" - channelTypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" - commitmentTypes "github.com/cosmos/ibc-go/v4/modules/core/23-commitment/types" - host "github.com/cosmos/ibc-go/v4/modules/core/24-host" - "github.com/cosmos/ibc-go/v4/modules/core/exported" - ibcTmTypes "github.com/cosmos/ibc-go/v4/modules/light-clients/07-tendermint/types" + clientTypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + connectionTypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" + channelTypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + commitmentTypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" + host "github.com/cosmos/ibc-go/v7/modules/core/24-host" + "github.com/cosmos/ibc-go/v7/modules/core/exported" + ibcTmTypes "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint/types" "github.com/stretchr/testify/require" ) diff --git a/e2e/voter_test.go b/e2e/voter_test.go index 7c5f533b..962d276c 100644 --- a/e2e/voter_test.go +++ b/e2e/voter_test.go @@ -20,7 +20,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" - channelTypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + channelTypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" voterPkg "github.com/archway-network/voter/src/pkg" voterCustomTypes "github.com/archway-network/voter/src/pkg/archway/custom" diff --git a/interchaintest/chain_upgrade_test.go b/interchaintest/chain_upgrade_test.go index 7174a67c..b5755780 100644 --- a/interchaintest/chain_upgrade_test.go +++ b/interchaintest/chain_upgrade_test.go @@ -6,10 +6,10 @@ import ( "time" "github.com/docker/docker/client" - interchaintest "github.com/strangelove-ventures/interchaintest/v4" - "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v4/ibc" - "github.com/strangelove-ventures/interchaintest/v4/testutil" + interchaintest "github.com/strangelove-ventures/interchaintest/v7" + "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v7/ibc" + "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" )