diff --git a/app/consumer-democracy/ante/forbidden_proposals_ante_test.go b/app/consumer-democracy/ante/forbidden_proposals_ante_test.go index c4c7123290..8fd7fe3824 100644 --- a/app/consumer-democracy/ante/forbidden_proposals_ante_test.go +++ b/app/consumer-democracy/ante/forbidden_proposals_ante_test.go @@ -14,8 +14,8 @@ import ( minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" "github.com/cosmos/cosmos-sdk/x/params/types/proposal" - app "github.com/cosmos/interchain-security/v5/app/consumer-democracy" - "github.com/cosmos/interchain-security/v5/app/consumer-democracy/ante" + app "github.com/cosmos/interchain-security/v4/app/consumer-democracy" + "github.com/cosmos/interchain-security/v4/app/consumer-democracy/ante" ) // in SDKv47 parameter updates full params object is required diff --git a/app/consumer-democracy/ante_handler.go b/app/consumer-democracy/ante_handler.go index b0f7432fb6..7e652ebb0c 100644 --- a/app/consumer-democracy/ante_handler.go +++ b/app/consumer-democracy/ante_handler.go @@ -10,9 +10,9 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/auth/ante" - democracyante "github.com/cosmos/interchain-security/v5/app/consumer-democracy/ante" - consumerante "github.com/cosmos/interchain-security/v5/app/consumer/ante" - ibcconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper" + democracyante "github.com/cosmos/interchain-security/v4/app/consumer-democracy/ante" + consumerante "github.com/cosmos/interchain-security/v4/app/consumer/ante" + ibcconsumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper" ) // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC diff --git a/app/consumer-democracy/app.go b/app/consumer-democracy/app.go index 190e6680d8..e90d35760e 100644 --- a/app/consumer-democracy/app.go +++ b/app/consumer-democracy/app.go @@ -103,14 +103,14 @@ import ( "github.com/cometbft/cometbft/libs/log" tmos "github.com/cometbft/cometbft/libs/os" - appencoding "github.com/cosmos/interchain-security/v5/app/encoding" - testutil "github.com/cosmos/interchain-security/v5/testutil/integration" - consumer "github.com/cosmos/interchain-security/v5/x/ccv/consumer" - consumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper" - consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - ccvdistr "github.com/cosmos/interchain-security/v5/x/ccv/democracy/distribution" - ccvgov "github.com/cosmos/interchain-security/v5/x/ccv/democracy/governance" - ccvstaking "github.com/cosmos/interchain-security/v5/x/ccv/democracy/staking" + appencoding "github.com/cosmos/interchain-security/v4/app/encoding" + testutil "github.com/cosmos/interchain-security/v4/testutil/integration" + consumer "github.com/cosmos/interchain-security/v4/x/ccv/consumer" + consumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper" + consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + ccvdistr "github.com/cosmos/interchain-security/v4/x/ccv/democracy/distribution" + ccvgov "github.com/cosmos/interchain-security/v4/x/ccv/democracy/governance" + ccvstaking "github.com/cosmos/interchain-security/v4/x/ccv/democracy/staking" ) const ( diff --git a/app/consumer-democracy/proposals_whitelisting_test.go b/app/consumer-democracy/proposals_whitelisting_test.go index c4209bf3b9..47dd42317a 100644 --- a/app/consumer-democracy/proposals_whitelisting_test.go +++ b/app/consumer-democracy/proposals_whitelisting_test.go @@ -6,9 +6,9 @@ import ( ibctesting "github.com/cosmos/ibc-go/v7/testing" "github.com/stretchr/testify/require" - appConsumer "github.com/cosmos/interchain-security/v5/app/consumer-democracy" - icstestingutils "github.com/cosmos/interchain-security/v5/testutil/ibc_testing" - testutil "github.com/cosmos/interchain-security/v5/testutil/integration" + appConsumer "github.com/cosmos/interchain-security/v4/app/consumer-democracy" + icstestingutils "github.com/cosmos/interchain-security/v4/testutil/ibc_testing" + testutil "github.com/cosmos/interchain-security/v4/testutil/integration" ) func TestDemocracyGovernanceWhitelistingKeys(t *testing.T) { diff --git a/app/consumer/ante/disabled_modules_ante_test.go b/app/consumer/ante/disabled_modules_ante_test.go index d06c3ad595..7fa95f37c6 100644 --- a/app/consumer/ante/disabled_modules_ante_test.go +++ b/app/consumer/ante/disabled_modules_ante_test.go @@ -12,8 +12,8 @@ import ( evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" - "github.com/cosmos/interchain-security/v5/app/consumer/ante" - appencoding "github.com/cosmos/interchain-security/v5/app/encoding" + "github.com/cosmos/interchain-security/v4/app/consumer/ante" + appencoding "github.com/cosmos/interchain-security/v4/app/encoding" ) func TestDisabledModulesDecorator(t *testing.T) { diff --git a/app/consumer/ante/msg_filter_ante_test.go b/app/consumer/ante/msg_filter_ante_test.go index 9dd5f47ef3..bfc1bb0a50 100644 --- a/app/consumer/ante/msg_filter_ante_test.go +++ b/app/consumer/ante/msg_filter_ante_test.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cosmos/interchain-security/v5/app/consumer/ante" - appencoding "github.com/cosmos/interchain-security/v5/app/encoding" + "github.com/cosmos/interchain-security/v4/app/consumer/ante" + appencoding "github.com/cosmos/interchain-security/v4/app/encoding" ) type consumerKeeper struct { diff --git a/app/consumer/ante_handler.go b/app/consumer/ante_handler.go index f9cd986dad..fa28a52caf 100644 --- a/app/consumer/ante_handler.go +++ b/app/consumer/ante_handler.go @@ -10,8 +10,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/auth/ante" - consumerante "github.com/cosmos/interchain-security/v5/app/consumer/ante" - ibcconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper" + consumerante "github.com/cosmos/interchain-security/v4/app/consumer/ante" + ibcconsumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper" ) // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC diff --git a/app/consumer/app.go b/app/consumer/app.go index 207939adcb..9853145117 100644 --- a/app/consumer/app.go +++ b/app/consumer/app.go @@ -87,11 +87,11 @@ import ( "github.com/cometbft/cometbft/libs/log" tmos "github.com/cometbft/cometbft/libs/os" - appencoding "github.com/cosmos/interchain-security/v5/app/encoding" - testutil "github.com/cosmos/interchain-security/v5/testutil/integration" - ibcconsumer "github.com/cosmos/interchain-security/v5/x/ccv/consumer" - ibcconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper" - ibcconsumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" + appencoding "github.com/cosmos/interchain-security/v4/app/encoding" + testutil "github.com/cosmos/interchain-security/v4/testutil/integration" + ibcconsumer "github.com/cosmos/interchain-security/v4/x/ccv/consumer" + ibcconsumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper" + ibcconsumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" ) const ( diff --git a/app/consumer/genesis.go b/app/consumer/genesis.go index da55a0334e..f6c8e47905 100644 --- a/app/consumer/genesis.go +++ b/app/consumer/genesis.go @@ -16,8 +16,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/version" - consumerTypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - "github.com/cosmos/interchain-security/v5/x/ccv/types" + consumerTypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // The genesis state of the blockchain is represented here as a map of raw json diff --git a/app/consumer/genesis_test.go b/app/consumer/genesis_test.go index 2dd29e1b71..5827651959 100644 --- a/app/consumer/genesis_test.go +++ b/app/consumer/genesis_test.go @@ -16,9 +16,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/x/auth/types" - app "github.com/cosmos/interchain-security/v5/app/consumer" - consumerTypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + app "github.com/cosmos/interchain-security/v4/app/consumer" + consumerTypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) const ( diff --git a/app/provider/app.go b/app/provider/app.go index e5baa31270..9cf45fe7e3 100644 --- a/app/provider/app.go +++ b/app/provider/app.go @@ -100,13 +100,13 @@ import ( "github.com/cometbft/cometbft/libs/log" tmos "github.com/cometbft/cometbft/libs/os" - appencoding "github.com/cosmos/interchain-security/v5/app/encoding" - testutil "github.com/cosmos/interchain-security/v5/testutil/integration" - "github.com/cosmos/interchain-security/v5/x/ccv/provider" - ibcprovider "github.com/cosmos/interchain-security/v5/x/ccv/provider" - ibcproviderclient "github.com/cosmos/interchain-security/v5/x/ccv/provider/client" - ibcproviderkeeper "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + appencoding "github.com/cosmos/interchain-security/v4/app/encoding" + testutil "github.com/cosmos/interchain-security/v4/testutil/integration" + "github.com/cosmos/interchain-security/v4/x/ccv/provider" + ibcprovider "github.com/cosmos/interchain-security/v4/x/ccv/provider" + ibcproviderclient "github.com/cosmos/interchain-security/v4/x/ccv/provider/client" + ibcproviderkeeper "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) const ( diff --git a/app/sovereign/app.go b/app/sovereign/app.go index 6dd9774f3b..4017ca9d4f 100644 --- a/app/sovereign/app.go +++ b/app/sovereign/app.go @@ -106,8 +106,8 @@ import ( "github.com/cometbft/cometbft/libs/log" tmos "github.com/cometbft/cometbft/libs/os" - appencoding "github.com/cosmos/interchain-security/v5/app/encoding" - testutil "github.com/cosmos/interchain-security/v5/testutil/integration" + appencoding "github.com/cosmos/interchain-security/v4/app/encoding" + testutil "github.com/cosmos/interchain-security/v4/testutil/integration" ) const ( diff --git a/cmd/interchain-security-cd/cmd/root.go b/cmd/interchain-security-cd/cmd/root.go index 3d844d9c7c..215b45317a 100644 --- a/cmd/interchain-security-cd/cmd/root.go +++ b/cmd/interchain-security-cd/cmd/root.go @@ -31,8 +31,8 @@ import ( tmcfg "github.com/cometbft/cometbft/config" "github.com/cometbft/cometbft/libs/log" - consumer "github.com/cosmos/interchain-security/v5/app/consumer" - appencoding "github.com/cosmos/interchain-security/v5/app/encoding" + consumer "github.com/cosmos/interchain-security/v4/app/consumer" + appencoding "github.com/cosmos/interchain-security/v4/app/encoding" ) // NewRootCmd creates a new root command for simd. It is called once in the diff --git a/cmd/interchain-security-cd/main.go b/cmd/interchain-security-cd/main.go index 7cbe0a898a..a64a2a8645 100644 --- a/cmd/interchain-security-cd/main.go +++ b/cmd/interchain-security-cd/main.go @@ -6,9 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - app "github.com/cosmos/interchain-security/v5/app/consumer" - appparams "github.com/cosmos/interchain-security/v5/app/params" - "github.com/cosmos/interchain-security/v5/cmd/interchain-security-cd/cmd" + app "github.com/cosmos/interchain-security/v4/app/consumer" + appparams "github.com/cosmos/interchain-security/v4/app/params" + "github.com/cosmos/interchain-security/v4/cmd/interchain-security-cd/cmd" ) func main() { diff --git a/cmd/interchain-security-cdd/cmd/root.go b/cmd/interchain-security-cdd/cmd/root.go index cb5140ade6..6b2e6cc726 100644 --- a/cmd/interchain-security-cdd/cmd/root.go +++ b/cmd/interchain-security-cdd/cmd/root.go @@ -31,8 +31,8 @@ import ( tmcfg "github.com/cometbft/cometbft/config" "github.com/cometbft/cometbft/libs/log" - cdd "github.com/cosmos/interchain-security/v5/app/consumer-democracy" - appencoding "github.com/cosmos/interchain-security/v5/app/encoding" + cdd "github.com/cosmos/interchain-security/v4/app/consumer-democracy" + appencoding "github.com/cosmos/interchain-security/v4/app/encoding" ) // NewRootCmd creates a new root command for simd. It is called once in the diff --git a/cmd/interchain-security-cdd/main.go b/cmd/interchain-security-cdd/main.go index 9fbd09df75..9b6aacd759 100644 --- a/cmd/interchain-security-cdd/main.go +++ b/cmd/interchain-security-cdd/main.go @@ -6,9 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - app "github.com/cosmos/interchain-security/v5/app/consumer-democracy" - appparams "github.com/cosmos/interchain-security/v5/app/params" - "github.com/cosmos/interchain-security/v5/cmd/interchain-security-cdd/cmd" + app "github.com/cosmos/interchain-security/v4/app/consumer-democracy" + appparams "github.com/cosmos/interchain-security/v4/app/params" + "github.com/cosmos/interchain-security/v4/cmd/interchain-security-cdd/cmd" ) func main() { diff --git a/cmd/interchain-security-pd/cmd/root.go b/cmd/interchain-security-pd/cmd/root.go index 7f1b0a6b9a..8a8f5fec32 100644 --- a/cmd/interchain-security-pd/cmd/root.go +++ b/cmd/interchain-security-pd/cmd/root.go @@ -31,8 +31,8 @@ import ( tmcfg "github.com/cometbft/cometbft/config" "github.com/cometbft/cometbft/libs/log" - appencoding "github.com/cosmos/interchain-security/v5/app/encoding" - providerApp "github.com/cosmos/interchain-security/v5/app/provider" + appencoding "github.com/cosmos/interchain-security/v4/app/encoding" + providerApp "github.com/cosmos/interchain-security/v4/app/provider" ) // NewRootCmd creates a new root command for simd. It is called once in the diff --git a/cmd/interchain-security-pd/main.go b/cmd/interchain-security-pd/main.go index dab89c91fc..7788f06bff 100644 --- a/cmd/interchain-security-pd/main.go +++ b/cmd/interchain-security-pd/main.go @@ -6,9 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - appparams "github.com/cosmos/interchain-security/v5/app/params" - app "github.com/cosmos/interchain-security/v5/app/provider" - "github.com/cosmos/interchain-security/v5/cmd/interchain-security-pd/cmd" + appparams "github.com/cosmos/interchain-security/v4/app/params" + app "github.com/cosmos/interchain-security/v4/app/provider" + "github.com/cosmos/interchain-security/v4/cmd/interchain-security-pd/cmd" ) func main() { diff --git a/cmd/interchain-security-sd/cmd/root.go b/cmd/interchain-security-sd/cmd/root.go index 10a79a251a..28520ef1a4 100644 --- a/cmd/interchain-security-sd/cmd/root.go +++ b/cmd/interchain-security-sd/cmd/root.go @@ -31,8 +31,8 @@ import ( tmcfg "github.com/cometbft/cometbft/config" "github.com/cometbft/cometbft/libs/log" - appencoding "github.com/cosmos/interchain-security/v5/app/encoding" - sovereignApp "github.com/cosmos/interchain-security/v5/app/sovereign" + appencoding "github.com/cosmos/interchain-security/v4/app/encoding" + sovereignApp "github.com/cosmos/interchain-security/v4/app/sovereign" ) // NewRootCmd creates a new root command for simd. It is called once in the diff --git a/cmd/interchain-security-sd/main.go b/cmd/interchain-security-sd/main.go index e719eb48f3..2265afad90 100644 --- a/cmd/interchain-security-sd/main.go +++ b/cmd/interchain-security-sd/main.go @@ -6,9 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - appparams "github.com/cosmos/interchain-security/v5/app/params" - app "github.com/cosmos/interchain-security/v5/app/sovereign" - "github.com/cosmos/interchain-security/v5/cmd/interchain-security-sd/cmd" + appparams "github.com/cosmos/interchain-security/v4/app/params" + app "github.com/cosmos/interchain-security/v4/app/sovereign" + "github.com/cosmos/interchain-security/v4/cmd/interchain-security-sd/cmd" ) func main() { diff --git a/go.mod b/go.mod index 4a5ddd9493..db8b94586c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/cosmos/interchain-security/v5 +module github.com/cosmos/interchain-security/v4 go 1.21.1 diff --git a/proto/interchain_security/ccv/consumer/v1/consumer.proto b/proto/interchain_security/ccv/consumer/v1/consumer.proto index 959d06c087..749eedc7ac 100644 --- a/proto/interchain_security/ccv/consumer/v1/consumer.proto +++ b/proto/interchain_security/ccv/consumer/v1/consumer.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package interchain_security.ccv.consumer.v1; -option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"; +option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types"; import "google/protobuf/any.proto"; import "gogoproto/gogo.proto"; diff --git a/proto/interchain_security/ccv/consumer/v1/genesis.proto b/proto/interchain_security/ccv/consumer/v1/genesis.proto index 642b78451d..a2ceb0f9f6 100644 --- a/proto/interchain_security/ccv/consumer/v1/genesis.proto +++ b/proto/interchain_security/ccv/consumer/v1/genesis.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package interchain_security.ccv.consumer.v1; -option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"; +option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types"; import "interchain_security/ccv/v1/shared_consumer.proto"; import "ibc/lightclients/tendermint/v1/tendermint.proto"; diff --git a/proto/interchain_security/ccv/consumer/v1/query.proto b/proto/interchain_security/ccv/consumer/v1/query.proto index 0e9b088e1d..eb8eb29a3d 100644 --- a/proto/interchain_security/ccv/consumer/v1/query.proto +++ b/proto/interchain_security/ccv/consumer/v1/query.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package interchain_security.ccv.consumer.v1; import "interchain_security/ccv/v1/shared_consumer.proto"; -option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"; +option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; diff --git a/proto/interchain_security/ccv/provider/v1/genesis.proto b/proto/interchain_security/ccv/provider/v1/genesis.proto index 269743721e..443ea26b32 100644 --- a/proto/interchain_security/ccv/provider/v1/genesis.proto +++ b/proto/interchain_security/ccv/provider/v1/genesis.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package interchain_security.ccv.provider.v1; -option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/provider/types"; +option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/provider/types"; import "gogoproto/gogo.proto"; import "interchain_security/ccv/v1/shared_consumer.proto"; diff --git a/proto/interchain_security/ccv/provider/v1/provider.proto b/proto/interchain_security/ccv/provider/v1/provider.proto index 068cdc0f06..139cc9d25f 100644 --- a/proto/interchain_security/ccv/provider/v1/provider.proto +++ b/proto/interchain_security/ccv/provider/v1/provider.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package interchain_security.ccv.provider.v1; -option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/provider/types"; +option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/provider/types"; import "interchain_security/ccv/v1/wire.proto"; import "gogoproto/gogo.proto"; diff --git a/proto/interchain_security/ccv/provider/v1/query.proto b/proto/interchain_security/ccv/provider/v1/query.proto index f6d5d5a379..139a7386de 100644 --- a/proto/interchain_security/ccv/provider/v1/query.proto +++ b/proto/interchain_security/ccv/provider/v1/query.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package interchain_security.ccv.provider.v1; -option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/provider/types"; +option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/provider/types"; import "google/api/annotations.proto"; import "gogoproto/gogo.proto"; diff --git a/proto/interchain_security/ccv/provider/v1/tx.proto b/proto/interchain_security/ccv/provider/v1/tx.proto index 02a69d25f9..8e8aab5408 100644 --- a/proto/interchain_security/ccv/provider/v1/tx.proto +++ b/proto/interchain_security/ccv/provider/v1/tx.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package interchain_security.ccv.provider.v1; -option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/provider/types"; +option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/provider/types"; import "gogoproto/gogo.proto"; import "cosmos_proto/cosmos.proto"; diff --git a/proto/interchain_security/ccv/v1/shared_consumer.proto b/proto/interchain_security/ccv/v1/shared_consumer.proto index ce65df04a6..d1f0a5d5a3 100644 --- a/proto/interchain_security/ccv/v1/shared_consumer.proto +++ b/proto/interchain_security/ccv/v1/shared_consumer.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package interchain_security.ccv.v1; -option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/types"; +option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/types"; import "tendermint/abci/types.proto"; import "ibc/lightclients/tendermint/v1/tendermint.proto"; diff --git a/proto/interchain_security/ccv/v1/wire.proto b/proto/interchain_security/ccv/v1/wire.proto index f0ba6ab41a..7382b9d0da 100644 --- a/proto/interchain_security/ccv/v1/wire.proto +++ b/proto/interchain_security/ccv/v1/wire.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package interchain_security.ccv.v1; -option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/types"; +option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/types"; import "cosmos/staking/v1beta1/staking.proto"; diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index fdf6a894c1..67ae158143 100644 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -16,6 +16,6 @@ done cd .. # move proto files to the right places -cp -r github.com/cosmos/interchain-security/v5/* ./ +cp -r github.com/cosmos/interchain-security/v4/* ./ rm -rf github.com diff --git a/tests/e2e/actions.go b/tests/e2e/actions.go index 31813efd27..1587608177 100644 --- a/tests/e2e/actions.go +++ b/tests/e2e/actions.go @@ -19,9 +19,9 @@ import ( "github.com/tidwall/gjson" "golang.org/x/mod/semver" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/client" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/client" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) const ( diff --git a/tests/integration/common.go b/tests/integration/common.go index 7c4e88c344..18b657ae56 100644 --- a/tests/integration/common.go +++ b/tests/integration/common.go @@ -22,10 +22,10 @@ import ( abci "github.com/cometbft/cometbft/abci/types" tmtypes "github.com/cometbft/cometbft/types" - icstestingutils "github.com/cosmos/interchain-security/v5/testutil/ibc_testing" - testutil "github.com/cosmos/interchain-security/v5/testutil/integration" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + icstestingutils "github.com/cosmos/interchain-security/v4/testutil/ibc_testing" + testutil "github.com/cosmos/interchain-security/v4/testutil/integration" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // ChainType defines the type of chain (either provider or consumer) diff --git a/tests/integration/democracy.go b/tests/integration/democracy.go index 53333aba0e..bbada900a8 100644 --- a/tests/integration/democracy.go +++ b/tests/integration/democracy.go @@ -14,9 +14,9 @@ import ( govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" - icstestingutils "github.com/cosmos/interchain-security/v5/testutil/ibc_testing" - testutil "github.com/cosmos/interchain-security/v5/testutil/integration" - consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" + icstestingutils "github.com/cosmos/interchain-security/v4/testutil/ibc_testing" + testutil "github.com/cosmos/interchain-security/v4/testutil/integration" + consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" ) type ConsumerDemocracyTestSuite struct { diff --git a/tests/integration/distribution.go b/tests/integration/distribution.go index edd7e3e0e1..5d62b2ee35 100644 --- a/tests/integration/distribution.go +++ b/tests/integration/distribution.go @@ -15,12 +15,12 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - icstestingutils "github.com/cosmos/interchain-security/v5/testutil/integration" - consumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper" - consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - providerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + icstestingutils "github.com/cosmos/interchain-security/v4/testutil/integration" + consumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper" + consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + providerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // This test is valid for minimal viable consumer chain diff --git a/tests/integration/double_vote.go b/tests/integration/double_vote.go index c23d3feb06..c22ba3b063 100644 --- a/tests/integration/double_vote.go +++ b/tests/integration/double_vote.go @@ -7,8 +7,8 @@ import ( tmcrypto "github.com/cometbft/cometbft/crypto" tmtypes "github.com/cometbft/cometbft/types" - testutil "github.com/cosmos/interchain-security/v5/testutil/crypto" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + testutil "github.com/cosmos/interchain-security/v4/testutil/crypto" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) // TestHandleConsumerDoubleVoting verifies that handling a double voting evidence diff --git a/tests/integration/expired_client.go b/tests/integration/expired_client.go index d5405df1c2..a46df32d8e 100644 --- a/tests/integration/expired_client.go +++ b/tests/integration/expired_client.go @@ -14,7 +14,7 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // TestVSCPacketSendWithExpiredClient tests queueing of VSCPackets when the consumer client is expired. diff --git a/tests/integration/instance_test.go b/tests/integration/instance_test.go index 424c6c85f5..d2896ad964 100644 --- a/tests/integration/instance_test.go +++ b/tests/integration/instance_test.go @@ -5,11 +5,11 @@ import ( "github.com/stretchr/testify/suite" - appConsumer "github.com/cosmos/interchain-security/v5/app/consumer" - appConsumerDemocracy "github.com/cosmos/interchain-security/v5/app/consumer-democracy" - appProvider "github.com/cosmos/interchain-security/v5/app/provider" - intg "github.com/cosmos/interchain-security/v5/tests/integration" - icstestingutils "github.com/cosmos/interchain-security/v5/testutil/ibc_testing" + appConsumer "github.com/cosmos/interchain-security/v4/app/consumer" + appConsumerDemocracy "github.com/cosmos/interchain-security/v4/app/consumer-democracy" + appProvider "github.com/cosmos/interchain-security/v4/app/provider" + intg "github.com/cosmos/interchain-security/v4/tests/integration" + icstestingutils "github.com/cosmos/interchain-security/v4/testutil/ibc_testing" ) // This file can be used as an example integration testing instance for any provider/consumer applications. diff --git a/tests/integration/key_assignment.go b/tests/integration/key_assignment.go index ad7a1a142e..799109c0d4 100644 --- a/tests/integration/key_assignment.go +++ b/tests/integration/key_assignment.go @@ -9,8 +9,8 @@ import ( tmencoding "github.com/cometbft/cometbft/crypto/encoding" tmprotocrypto "github.com/cometbft/cometbft/proto/tendermint/crypto" - providerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + providerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) func (s *CCVTestSuite) TestKeyAssignment() { diff --git a/tests/integration/misbehaviour.go b/tests/integration/misbehaviour.go index cea0d15e5f..acdcd0071c 100644 --- a/tests/integration/misbehaviour.go +++ b/tests/integration/misbehaviour.go @@ -9,8 +9,8 @@ import ( tmtypes "github.com/cometbft/cometbft/types" - testutil "github.com/cosmos/interchain-security/v5/testutil/crypto" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + testutil "github.com/cosmos/interchain-security/v4/testutil/crypto" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) // TestHandleConsumerMisbehaviour tests that handling a valid misbehaviour, diff --git a/tests/integration/normal_operations.go b/tests/integration/normal_operations.go index 61f7507793..81c742eeed 100644 --- a/tests/integration/normal_operations.go +++ b/tests/integration/normal_operations.go @@ -5,8 +5,8 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // Tests the tracking of historical info in the context of new blocks being committed diff --git a/tests/integration/setup.go b/tests/integration/setup.go index a70dab3dec..cb7c78a3be 100644 --- a/tests/integration/setup.go +++ b/tests/integration/setup.go @@ -20,12 +20,12 @@ import ( abci "github.com/cometbft/cometbft/abci/types" tmencoding "github.com/cometbft/cometbft/crypto/encoding" - icstestingutils "github.com/cosmos/interchain-security/v5/testutil/ibc_testing" - testutil "github.com/cosmos/interchain-security/v5/testutil/integration" - "github.com/cosmos/interchain-security/v5/testutil/simibc" - consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + icstestingutils "github.com/cosmos/interchain-security/v4/testutil/ibc_testing" + testutil "github.com/cosmos/interchain-security/v4/testutil/integration" + "github.com/cosmos/interchain-security/v4/testutil/simibc" + consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // Callback for instantiating a new coordinator with a provider test chains diff --git a/tests/integration/slashing.go b/tests/integration/slashing.go index a9dcf223f2..19805a49ad 100644 --- a/tests/integration/slashing.go +++ b/tests/integration/slashing.go @@ -18,9 +18,9 @@ import ( "github.com/cometbft/cometbft/crypto/ed25519" tmtypes "github.com/cometbft/cometbft/types" - keepertestutil "github.com/cosmos/interchain-security/v5/testutil/keeper" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + keepertestutil "github.com/cosmos/interchain-security/v4/testutil/keeper" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // TestRelayAndApplyDowntimePacket tests that downtime slash packets can be properly relayed diff --git a/tests/integration/soft_opt_out.go b/tests/integration/soft_opt_out.go index 3799de79fc..bce2e1d77c 100644 --- a/tests/integration/soft_opt_out.go +++ b/tests/integration/soft_opt_out.go @@ -10,8 +10,8 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - consumerKeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + consumerKeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // TestSoftOptOut tests the soft opt-out feature diff --git a/tests/integration/stop_consumer.go b/tests/integration/stop_consumer.go index 33f36fa186..6e72679ccd 100644 --- a/tests/integration/stop_consumer.go +++ b/tests/integration/stop_consumer.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // Tests the functionality of stopping a consumer chain at a higher level than unit tests diff --git a/tests/integration/throttle.go b/tests/integration/throttle.go index e9e013575c..ff2d32dade 100644 --- a/tests/integration/throttle.go +++ b/tests/integration/throttle.go @@ -10,10 +10,10 @@ import ( tmtypes "github.com/cometbft/cometbft/types" - icstestingutils "github.com/cosmos/interchain-security/v5/testutil/ibc_testing" - "github.com/cosmos/interchain-security/v5/x/ccv/provider" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + icstestingutils "github.com/cosmos/interchain-security/v4/testutil/ibc_testing" + "github.com/cosmos/interchain-security/v4/x/ccv/provider" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) const fullSlashMeterString = "1.0" diff --git a/tests/integration/throttle_retry.go b/tests/integration/throttle_retry.go index 3d26847136..36acad3602 100644 --- a/tests/integration/throttle_retry.go +++ b/tests/integration/throttle_retry.go @@ -7,7 +7,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // TestSlashRetries tests the throttling v2 retry logic at an integration level. diff --git a/tests/integration/unbonding.go b/tests/integration/unbonding.go index ca94fd3679..7f87516444 100644 --- a/tests/integration/unbonding.go +++ b/tests/integration/unbonding.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - providerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + providerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // TestUndelegationNormalOperation tests that undelegations complete after diff --git a/tests/integration/valset_update.go b/tests/integration/valset_update.go index 113dcc01f4..eb0560a35e 100644 --- a/tests/integration/valset_update.go +++ b/tests/integration/valset_update.go @@ -10,7 +10,7 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // TestPacketRoundtrip tests a CCV packet roundtrip when tokens are bonded on provider diff --git a/tests/mbt/driver/core.go b/tests/mbt/driver/core.go index 9235071d3e..3c985cb6fa 100644 --- a/tests/mbt/driver/core.go +++ b/tests/mbt/driver/core.go @@ -24,14 +24,14 @@ import ( "github.com/cometbft/cometbft/proto/tendermint/crypto" cmttypes "github.com/cometbft/cometbft/types" - appConsumer "github.com/cosmos/interchain-security/v5/app/consumer" - appProvider "github.com/cosmos/interchain-security/v5/app/provider" - simibc "github.com/cosmos/interchain-security/v5/testutil/simibc" - consumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper" - consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - providerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - "github.com/cosmos/interchain-security/v5/x/ccv/types" + appConsumer "github.com/cosmos/interchain-security/v4/app/consumer" + appProvider "github.com/cosmos/interchain-security/v4/app/provider" + simibc "github.com/cosmos/interchain-security/v4/testutil/simibc" + consumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper" + consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + providerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // Define a new type for ChainIds to be more explicit diff --git a/tests/mbt/driver/mbt_test.go b/tests/mbt/driver/mbt_test.go index e9a50f5c52..9a82bd7b9b 100644 --- a/tests/mbt/driver/mbt_test.go +++ b/tests/mbt/driver/mbt_test.go @@ -21,9 +21,9 @@ import ( tmencoding "github.com/cometbft/cometbft/crypto/encoding" cmttypes "github.com/cometbft/cometbft/types" - "github.com/cosmos/interchain-security/v5/testutil/integration" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/testutil/integration" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + "github.com/cosmos/interchain-security/v4/x/ccv/types" ) const verbose = false diff --git a/tests/mbt/driver/setup.go b/tests/mbt/driver/setup.go index d30b85bf30..a49a1ac000 100644 --- a/tests/mbt/driver/setup.go +++ b/tests/mbt/driver/setup.go @@ -30,12 +30,12 @@ import ( cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" cmttypes "github.com/cometbft/cometbft/types" - icstestingutils "github.com/cosmos/interchain-security/v5/testutil/ibc_testing" - "github.com/cosmos/interchain-security/v5/testutil/integration" - simibc "github.com/cosmos/interchain-security/v5/testutil/simibc" - consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + icstestingutils "github.com/cosmos/interchain-security/v4/testutil/ibc_testing" + "github.com/cosmos/interchain-security/v4/testutil/integration" + simibc "github.com/cosmos/interchain-security/v4/testutil/simibc" + consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) const ( diff --git a/testutil/crypto/crypto.go b/testutil/crypto/crypto.go index df37e99eb5..a9c5341947 100644 --- a/testutil/crypto/crypto.go +++ b/testutil/crypto/crypto.go @@ -15,7 +15,7 @@ import ( tmprotocrypto "github.com/cometbft/cometbft/proto/tendermint/crypto" tmtypes "github.com/cometbft/cometbft/types" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) // CryptoIdentity is a test helper for generating keys and addresses of diff --git a/testutil/ibc_testing/generic_setup.go b/testutil/ibc_testing/generic_setup.go index 9d5ec02a71..09dfa62140 100644 --- a/testutil/ibc_testing/generic_setup.go +++ b/testutil/ibc_testing/generic_setup.go @@ -16,10 +16,10 @@ import ( tmencoding "github.com/cometbft/cometbft/crypto/encoding" tmtypes "github.com/cometbft/cometbft/types" - testutil "github.com/cosmos/interchain-security/v5/testutil/integration" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - consumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + testutil "github.com/cosmos/interchain-security/v4/testutil/integration" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + consumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) type ( diff --git a/testutil/ibc_testing/specific_setup.go b/testutil/ibc_testing/specific_setup.go index 81788e10bc..2571346ca6 100644 --- a/testutil/ibc_testing/specific_setup.go +++ b/testutil/ibc_testing/specific_setup.go @@ -17,11 +17,11 @@ import ( "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" - appConsumer "github.com/cosmos/interchain-security/v5/app/consumer" - appConsumerDemocracy "github.com/cosmos/interchain-security/v5/app/consumer-democracy" - appProvider "github.com/cosmos/interchain-security/v5/app/provider" - consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + appConsumer "github.com/cosmos/interchain-security/v4/app/consumer" + appConsumerDemocracy "github.com/cosmos/interchain-security/v4/app/consumer-democracy" + appProvider "github.com/cosmos/interchain-security/v4/app/provider" + consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) var ( diff --git a/testutil/integration/debug_test.go b/testutil/integration/debug_test.go index ed0ec3d65b..2481e865ab 100644 --- a/testutil/integration/debug_test.go +++ b/testutil/integration/debug_test.go @@ -6,11 +6,11 @@ import ( "reflect" "testing" - appConsumer "github.com/cosmos/interchain-security/v5/app/consumer" - appConsumerDemocracy "github.com/cosmos/interchain-security/v5/app/consumer-democracy" - appProvider "github.com/cosmos/interchain-security/v5/app/provider" - integr "github.com/cosmos/interchain-security/v5/tests/integration" - icstestingutils "github.com/cosmos/interchain-security/v5/testutil/ibc_testing" + appConsumer "github.com/cosmos/interchain-security/v4/app/consumer" + appConsumerDemocracy "github.com/cosmos/interchain-security/v4/app/consumer-democracy" + appProvider "github.com/cosmos/interchain-security/v4/app/provider" + integr "github.com/cosmos/interchain-security/v4/tests/integration" + icstestingutils "github.com/cosmos/interchain-security/v4/testutil/ibc_testing" ) // runCCVTestByName runs a single CCV integration test by name, using a CCVTestSuite diff --git a/testutil/integration/interfaces.go b/testutil/integration/interfaces.go index 83d071a037..fe3382b524 100644 --- a/testutil/integration/interfaces.go +++ b/testutil/integration/interfaces.go @@ -20,9 +20,9 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - consumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper" - providerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + consumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper" + providerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // The interface that any provider app must implement to be compatible with ccv integration tests. diff --git a/testutil/keeper/expectations.go b/testutil/keeper/expectations.go index c595a5c080..5a37f3a164 100644 --- a/testutil/keeper/expectations.go +++ b/testutil/keeper/expectations.go @@ -17,8 +17,8 @@ import ( capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - "github.com/cosmos/interchain-security/v5/x/ccv/types" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // diff --git a/testutil/keeper/unit_test_helpers.go b/testutil/keeper/unit_test_helpers.go index 3a80eecce8..abba1a23c9 100644 --- a/testutil/keeper/unit_test_helpers.go +++ b/testutil/keeper/unit_test_helpers.go @@ -27,11 +27,11 @@ import ( "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - consumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper" - consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - providerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - "github.com/cosmos/interchain-security/v5/x/ccv/types" + consumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper" + consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + providerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // Parameters needed to instantiate an in-memory keeper diff --git a/x/ccv/consumer/client/cli/query.go b/x/ccv/consumer/client/cli/query.go index 3630b3ed3f..806b91d2cf 100644 --- a/x/ccv/consumer/client/cli/query.go +++ b/x/ccv/consumer/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" + "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" ) // NewQueryCmd returns a root CLI command handler for all x/ccv/provider query commands. diff --git a/x/ccv/consumer/ibc_module.go b/x/ccv/consumer/ibc_module.go index 4780a0bc73..71caa4a082 100644 --- a/x/ccv/consumer/ibc_module.go +++ b/x/ccv/consumer/ibc_module.go @@ -17,9 +17,9 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper" - consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper" + consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // OnChanOpenInit implements the IBCModule interface diff --git a/x/ccv/consumer/ibc_module_test.go b/x/ccv/consumer/ibc_module_test.go index b8868038c9..51fd910902 100644 --- a/x/ccv/consumer/ibc_module_test.go +++ b/x/ccv/consumer/ibc_module_test.go @@ -13,10 +13,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/consumer" - consumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/consumer" + consumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // TestOnChanOpenInit validates the consumer's OnChanOpenInit implementation against the spec. diff --git a/x/ccv/consumer/keeper/changeover_test.go b/x/ccv/consumer/keeper/changeover_test.go index 89d45534dd..c431f43477 100644 --- a/x/ccv/consumer/keeper/changeover_test.go +++ b/x/ccv/consumer/keeper/changeover_test.go @@ -11,8 +11,8 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - "github.com/cosmos/interchain-security/v5/testutil/crypto" - uthelpers "github.com/cosmos/interchain-security/v5/testutil/keeper" + "github.com/cosmos/interchain-security/v4/testutil/crypto" + uthelpers "github.com/cosmos/interchain-security/v4/testutil/keeper" ) func TestChangeoverToConsumer(t *testing.T) { diff --git a/x/ccv/consumer/keeper/distribution.go b/x/ccv/consumer/keeper/distribution.go index d6157e50b5..1b98638498 100644 --- a/x/ccv/consumer/keeper/distribution.go +++ b/x/ccv/consumer/keeper/distribution.go @@ -12,8 +12,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // EndBlockRD executes EndBlock logic for the Reward Distribution sub-protocol. diff --git a/x/ccv/consumer/keeper/distribution_test.go b/x/ccv/consumer/keeper/distribution_test.go index 199acae5b0..189842a90e 100644 --- a/x/ccv/consumer/keeper/distribution_test.go +++ b/x/ccv/consumer/keeper/distribution_test.go @@ -10,9 +10,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authTypes "github.com/cosmos/cosmos-sdk/x/auth/types" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // TestGetEstimatedNextFeeDistribution tests next fee distribution parameters. diff --git a/x/ccv/consumer/keeper/genesis.go b/x/ccv/consumer/keeper/genesis.go index bdb8e35418..1b9afb2a4e 100644 --- a/x/ccv/consumer/keeper/genesis.go +++ b/x/ccv/consumer/keeper/genesis.go @@ -7,8 +7,8 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // InitGenesis initializes the CCV consumer state and binds to PortID. diff --git a/x/ccv/consumer/keeper/genesis_test.go b/x/ccv/consumer/keeper/genesis_test.go index 77e7e639d3..b9fc1b6f3a 100644 --- a/x/ccv/consumer/keeper/genesis_test.go +++ b/x/ccv/consumer/keeper/genesis_test.go @@ -18,11 +18,11 @@ import ( abci "github.com/cometbft/cometbft/abci/types" tmtypes "github.com/cometbft/cometbft/types" - "github.com/cosmos/interchain-security/v5/testutil/crypto" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - consumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper" - consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/testutil/crypto" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + consumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper" + consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // TestInitGenesis tests that a consumer chain is correctly initialised from genesis. diff --git a/x/ccv/consumer/keeper/grpc_query.go b/x/ccv/consumer/keeper/grpc_query.go index 2f1543071b..5ac5116a28 100644 --- a/x/ccv/consumer/keeper/grpc_query.go +++ b/x/ccv/consumer/keeper/grpc_query.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) var _ types.QueryServer = Keeper{} //nolint:golint diff --git a/x/ccv/consumer/keeper/hooks.go b/x/ccv/consumer/keeper/hooks.go index 715be50e08..c730bf266c 100644 --- a/x/ccv/consumer/keeper/hooks.go +++ b/x/ccv/consumer/keeper/hooks.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) var _ ccv.ConsumerHooks = Keeper{} diff --git a/x/ccv/consumer/keeper/keeper.go b/x/ccv/consumer/keeper/keeper.go index e4f1830333..b8751344b8 100644 --- a/x/ccv/consumer/keeper/keeper.go +++ b/x/ccv/consumer/keeper/keeper.go @@ -23,8 +23,8 @@ import ( tmtypes "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" - "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // Keeper defines the Cross-Chain Validation Consumer Keeper diff --git a/x/ccv/consumer/keeper/keeper_test.go b/x/ccv/consumer/keeper/keeper_test.go index 4ece86571d..19856211b5 100644 --- a/x/ccv/consumer/keeper/keeper_test.go +++ b/x/ccv/consumer/keeper/keeper_test.go @@ -17,10 +17,10 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - "github.com/cosmos/interchain-security/v5/testutil/crypto" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/testutil/crypto" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // TestProviderClientID tests getter and setter functionality for the client ID stored on consumer keeper diff --git a/x/ccv/consumer/keeper/migrations.go b/x/ccv/consumer/keeper/migrations.go index 71139fb36c..a1e826e61e 100644 --- a/x/ccv/consumer/keeper/migrations.go +++ b/x/ccv/consumer/keeper/migrations.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - v2 "github.com/cosmos/interchain-security/v5/x/ccv/consumer/migrations/v2" + v2 "github.com/cosmos/interchain-security/v4/x/ccv/consumer/migrations/v2" ) // Migrator is a struct for handling in-place store migrations. diff --git a/x/ccv/consumer/keeper/params.go b/x/ccv/consumer/keeper/params.go index 818b2858bc..4d96ddf604 100644 --- a/x/ccv/consumer/keeper/params.go +++ b/x/ccv/consumer/keeper/params.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // GetParams returns the params for the consumer ccv module diff --git a/x/ccv/consumer/keeper/params_test.go b/x/ccv/consumer/keeper/params_test.go index 18d3f5a2b2..e2975a0b31 100644 --- a/x/ccv/consumer/keeper/params_test.go +++ b/x/ccv/consumer/keeper/params_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // TestParams tests getters/setters for consumer params diff --git a/x/ccv/consumer/keeper/provider_info.go b/x/ccv/consumer/keeper/provider_info.go index aab84e1f85..e5fbaf6540 100644 --- a/x/ccv/consumer/keeper/provider_info.go +++ b/x/ccv/consumer/keeper/provider_info.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) func (k Keeper) GetProviderInfo(ctx sdk.Context) (*types.QueryProviderInfoResponse, error) { //nolint:golint diff --git a/x/ccv/consumer/keeper/relay.go b/x/ccv/consumer/keeper/relay.go index cf431fc054..2d4e16510a 100644 --- a/x/ccv/consumer/keeper/relay.go +++ b/x/ccv/consumer/keeper/relay.go @@ -14,8 +14,8 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // OnRecvVSCPacket sets the pending validator set changes that will be flushed to ABCI on Endblock diff --git a/x/ccv/consumer/keeper/relay_test.go b/x/ccv/consumer/keeper/relay_test.go index b1042de5d0..46a805a85a 100644 --- a/x/ccv/consumer/keeper/relay_test.go +++ b/x/ccv/consumer/keeper/relay_test.go @@ -21,11 +21,11 @@ import ( abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/bytes" - "github.com/cosmos/interchain-security/v5/testutil/crypto" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - consumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper" - consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/testutil/crypto" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + consumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper" + consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // TestOnRecvVSCPacket tests the behavior of OnRecvVSCPacket over various packet scenarios diff --git a/x/ccv/consumer/keeper/soft_opt_out.go b/x/ccv/consumer/keeper/soft_opt_out.go index 120d3d46d1..e5990ff65d 100644 --- a/x/ccv/consumer/keeper/soft_opt_out.go +++ b/x/ccv/consumer/keeper/soft_opt_out.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" + "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" ) // BeginBlockSoftOptOut executes BeginBlock logic for the Soft Opt-Out sub-protocol diff --git a/x/ccv/consumer/keeper/soft_opt_out_test.go b/x/ccv/consumer/keeper/soft_opt_out_test.go index 5c21133832..1a726d1767 100644 --- a/x/ccv/consumer/keeper/soft_opt_out_test.go +++ b/x/ccv/consumer/keeper/soft_opt_out_test.go @@ -7,9 +7,9 @@ import ( tmtypes "github.com/cometbft/cometbft/types" - "github.com/cosmos/interchain-security/v5/testutil/crypto" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/testutil/crypto" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // Tests that UpdateSmallestNonOptOutPower updates the smallest validator power that cannot soft opt out. diff --git a/x/ccv/consumer/keeper/throttle_retry.go b/x/ccv/consumer/keeper/throttle_retry.go index 4b6df3cc04..22e48f9175 100644 --- a/x/ccv/consumer/keeper/throttle_retry.go +++ b/x/ccv/consumer/keeper/throttle_retry.go @@ -5,7 +5,7 @@ import ( sdktypes "github.com/cosmos/cosmos-sdk/types" - consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" + consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" ) // diff --git a/x/ccv/consumer/keeper/throttle_retry_test.go b/x/ccv/consumer/keeper/throttle_retry_test.go index b979ebb51d..4a222fde90 100644 --- a/x/ccv/consumer/keeper/throttle_retry_test.go +++ b/x/ccv/consumer/keeper/throttle_retry_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" - testutil "github.com/cosmos/interchain-security/v5/testutil/keeper" - consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + testutil "github.com/cosmos/interchain-security/v4/testutil/keeper" + consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) func TestPacketSendingPermitted(t *testing.T) { diff --git a/x/ccv/consumer/keeper/validators.go b/x/ccv/consumer/keeper/validators.go index fa1c8991db..24a1c5a57c 100644 --- a/x/ccv/consumer/keeper/validators.go +++ b/x/ccv/consumer/keeper/validators.go @@ -11,7 +11,7 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" + "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" ) // diff --git a/x/ccv/consumer/keeper/validators_test.go b/x/ccv/consumer/keeper/validators_test.go index f1c3dbd3f3..1d4dcb2c86 100644 --- a/x/ccv/consumer/keeper/validators_test.go +++ b/x/ccv/consumer/keeper/validators_test.go @@ -15,10 +15,10 @@ import ( tmrand "github.com/cometbft/cometbft/libs/rand" tmtypes "github.com/cometbft/cometbft/types" - "github.com/cosmos/interchain-security/v5/testutil/crypto" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" + "github.com/cosmos/interchain-security/v4/testutil/crypto" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" ) // TestApplyCCValidatorChanges tests the ApplyCCValidatorChanges method for a consumer keeper diff --git a/x/ccv/consumer/migrations/v2/migration.go b/x/ccv/consumer/migrations/v2/migration.go index ed54512172..80f06d4d71 100644 --- a/x/ccv/consumer/migrations/v2/migration.go +++ b/x/ccv/consumer/migrations/v2/migration.go @@ -6,8 +6,8 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // MigrateConsumerPacketData migrates consumer packet data according to diff --git a/x/ccv/consumer/migrations/v2/migration_test.go b/x/ccv/consumer/migrations/v2/migration_test.go index 8ef05bcbcf..a99a2be0fb 100644 --- a/x/ccv/consumer/migrations/v2/migration_test.go +++ b/x/ccv/consumer/migrations/v2/migration_test.go @@ -9,10 +9,10 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - testutil "github.com/cosmos/interchain-security/v5/testutil/keeper" - v2 "github.com/cosmos/interchain-security/v5/x/ccv/consumer/migrations/v2" - consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + testutil "github.com/cosmos/interchain-security/v4/testutil/keeper" + v2 "github.com/cosmos/interchain-security/v4/x/ccv/consumer/migrations/v2" + consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) func TestMigrateConsumerPacketData(t *testing.T) { diff --git a/x/ccv/consumer/module.go b/x/ccv/consumer/module.go index f522a34fb8..4b5d9c053b 100644 --- a/x/ccv/consumer/module.go +++ b/x/ccv/consumer/module.go @@ -19,10 +19,10 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - "github.com/cosmos/interchain-security/v5/x/ccv/consumer/client/cli" - "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper" - consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/x/ccv/consumer/client/cli" + "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper" + consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) var ( diff --git a/x/ccv/consumer/types/genesis.go b/x/ccv/consumer/types/genesis.go index 9c3fab9c15..cb9cb61f40 100644 --- a/x/ccv/consumer/types/genesis.go +++ b/x/ccv/consumer/types/genesis.go @@ -7,7 +7,7 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // NewRestartGenesisState returns a consumer GenesisState that has already been established. diff --git a/x/ccv/consumer/types/genesis.pb.go b/x/ccv/consumer/types/genesis.pb.go index b51d09efac..dbb7c51981 100644 --- a/x/ccv/consumer/types/genesis.pb.go +++ b/x/ccv/consumer/types/genesis.pb.go @@ -10,7 +10,7 @@ import ( proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" _07_tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - types "github.com/cosmos/interchain-security/v5/x/ccv/types" + types "github.com/cosmos/interchain-security/v4/x/ccv/types" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" diff --git a/x/ccv/consumer/types/genesis_test.go b/x/ccv/consumer/types/genesis_test.go index befd935ba4..dcd30b642c 100644 --- a/x/ccv/consumer/types/genesis_test.go +++ b/x/ccv/consumer/types/genesis_test.go @@ -15,9 +15,9 @@ import ( abci "github.com/cometbft/cometbft/abci/types" tmtypes "github.com/cometbft/cometbft/types" - "github.com/cosmos/interchain-security/v5/testutil/crypto" - "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/testutil/crypto" + "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) const ( diff --git a/x/ccv/consumer/types/keys.go b/x/ccv/consumer/types/keys.go index f6400266e8..20163f5ed9 100644 --- a/x/ccv/consumer/types/keys.go +++ b/x/ccv/consumer/types/keys.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) const ( diff --git a/x/ccv/consumer/types/params_test.go b/x/ccv/consumer/types/params_test.go index caff4db0b1..5b11b52d43 100644 --- a/x/ccv/consumer/types/params_test.go +++ b/x/ccv/consumer/types/params_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // Tests the validation of consumer params that happens at genesis diff --git a/x/ccv/consumer/types/query.pb.go b/x/ccv/consumer/types/query.pb.go index 29f7d33971..fe62a4217f 100644 --- a/x/ccv/consumer/types/query.pb.go +++ b/x/ccv/consumer/types/query.pb.go @@ -9,7 +9,7 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - types "github.com/cosmos/interchain-security/v5/x/ccv/types" + types "github.com/cosmos/interchain-security/v4/x/ccv/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/x/ccv/democracy/distribution/module.go b/x/ccv/democracy/distribution/module.go index b30893402b..af35c86846 100644 --- a/x/ccv/democracy/distribution/module.go +++ b/x/ccv/democracy/distribution/module.go @@ -16,7 +16,7 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" + consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" ) var ( diff --git a/x/ccv/provider/client/cli/query.go b/x/ccv/provider/client/cli/query.go index 575470c6f3..cf68d24681 100644 --- a/x/ccv/provider/client/cli/query.go +++ b/x/ccv/provider/client/cli/query.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/version" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) // NewQueryCmd returns a root CLI command handler for all x/ccv/provider query commands. diff --git a/x/ccv/provider/client/cli/tx.go b/x/ccv/provider/client/cli/tx.go index ef65abc28e..876aaa9b8b 100644 --- a/x/ccv/provider/client/cli/tx.go +++ b/x/ccv/provider/client/cli/tx.go @@ -18,7 +18,7 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/ccv/provider/client/proposal_handler.go b/x/ccv/provider/client/proposal_handler.go index 9942a6d431..bb88276393 100644 --- a/x/ccv/provider/client/proposal_handler.go +++ b/x/ccv/provider/client/proposal_handler.go @@ -20,7 +20,7 @@ import ( govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) var ( diff --git a/x/ccv/provider/handler.go b/x/ccv/provider/handler.go index 72abf10c1c..8232ef3b6c 100644 --- a/x/ccv/provider/handler.go +++ b/x/ccv/provider/handler.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) func NewHandler(k *keeper.Keeper) sdk.Handler { diff --git a/x/ccv/provider/handler_test.go b/x/ccv/provider/handler_test.go index 2351b6c61c..6e13511e3b 100644 --- a/x/ccv/provider/handler_test.go +++ b/x/ccv/provider/handler_test.go @@ -14,11 +14,11 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - testcrypto "github.com/cosmos/interchain-security/v5/testutil/crypto" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/provider" - keeper "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + testcrypto "github.com/cosmos/interchain-security/v4/testutil/crypto" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/provider" + keeper "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) func TestInvalidMsg(t *testing.T) { diff --git a/x/ccv/provider/ibc_middleware.go b/x/ccv/provider/ibc_middleware.go index a1ef6e0db8..fb4d96890f 100644 --- a/x/ccv/provider/ibc_middleware.go +++ b/x/ccv/provider/ibc_middleware.go @@ -12,8 +12,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) var _ porttypes.Middleware = &IBCMiddleware{} diff --git a/x/ccv/provider/ibc_middleware_test.go b/x/ccv/provider/ibc_middleware_test.go index e2be5a649d..347cdc66cb 100644 --- a/x/ccv/provider/ibc_middleware_test.go +++ b/x/ccv/provider/ibc_middleware_test.go @@ -7,7 +7,7 @@ import ( channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/stretchr/testify/require" - "github.com/cosmos/interchain-security/v5/x/ccv/provider" + "github.com/cosmos/interchain-security/v4/x/ccv/provider" ) func TestGetProviderDenom(t *testing.T) { diff --git a/x/ccv/provider/ibc_module.go b/x/ccv/provider/ibc_module.go index f4b1eace4d..f6ad43d60b 100644 --- a/x/ccv/provider/ibc_module.go +++ b/x/ccv/provider/ibc_module.go @@ -15,9 +15,9 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // OnChanOpenInit implements the IBCModule interface diff --git a/x/ccv/provider/ibc_module_test.go b/x/ccv/provider/ibc_module_test.go index 9d41a4d9e1..df12ed4cb8 100644 --- a/x/ccv/provider/ibc_module_test.go +++ b/x/ccv/provider/ibc_module_test.go @@ -15,11 +15,11 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/provider" - providerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/provider" + providerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // TestOnChanOpenInit tests the provider's OnChanOpenInit method against spec. diff --git a/x/ccv/provider/keeper/consumer_equivocation.go b/x/ccv/provider/keeper/consumer_equivocation.go index 6324dfa5c0..8fc9808304 100644 --- a/x/ccv/provider/keeper/consumer_equivocation.go +++ b/x/ccv/provider/keeper/consumer_equivocation.go @@ -19,8 +19,8 @@ import ( tmtypes "github.com/cometbft/cometbft/types" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // diff --git a/x/ccv/provider/keeper/consumer_equivocation_test.go b/x/ccv/provider/keeper/consumer_equivocation_test.go index 13b56fc04a..d92caf69a3 100644 --- a/x/ccv/provider/keeper/consumer_equivocation_test.go +++ b/x/ccv/provider/keeper/consumer_equivocation_test.go @@ -18,9 +18,9 @@ import ( tmtypes "github.com/cometbft/cometbft/types" - cryptotestutil "github.com/cosmos/interchain-security/v5/testutil/crypto" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + cryptotestutil "github.com/cosmos/interchain-security/v4/testutil/crypto" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) func TestVerifyDoubleVotingEvidence(t *testing.T) { diff --git a/x/ccv/provider/keeper/distribution.go b/x/ccv/provider/keeper/distribution.go index 49137936eb..67e6193e5d 100644 --- a/x/ccv/provider/keeper/distribution.go +++ b/x/ccv/provider/keeper/distribution.go @@ -12,7 +12,7 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) // BeginBlockRD executes BeginBlock logic for the Reward Distribution sub-protocol. diff --git a/x/ccv/provider/keeper/distribution_test.go b/x/ccv/provider/keeper/distribution_test.go index 4a5cd750fc..d95ae598c0 100644 --- a/x/ccv/provider/keeper/distribution_test.go +++ b/x/ccv/provider/keeper/distribution_test.go @@ -14,9 +14,9 @@ import ( tmtypes "github.com/cometbft/cometbft/types" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) func TestComputeConsumerTotalVotingPower(t *testing.T) { diff --git a/x/ccv/provider/keeper/genesis.go b/x/ccv/provider/keeper/genesis.go index 66895233a7..2075ff48ae 100644 --- a/x/ccv/provider/keeper/genesis.go +++ b/x/ccv/provider/keeper/genesis.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // InitGenesis initializes the CCV provider state and binds to PortID. diff --git a/x/ccv/provider/keeper/genesis_test.go b/x/ccv/provider/keeper/genesis_test.go index e75241eb58..81b0a90bd8 100644 --- a/x/ccv/provider/keeper/genesis_test.go +++ b/x/ccv/provider/keeper/genesis_test.go @@ -11,11 +11,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/interchain-security/v5/testutil/crypto" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/testutil/crypto" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // TestInitAndExportGenesis tests the export and the initialisation of a provider chain genesis diff --git a/x/ccv/provider/keeper/grpc_query.go b/x/ccv/provider/keeper/grpc_query.go index 2baed949b7..84c5928fea 100644 --- a/x/ccv/provider/keeper/grpc_query.go +++ b/x/ccv/provider/keeper/grpc_query.go @@ -11,8 +11,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/ccv/provider/keeper/grpc_query_test.go b/x/ccv/provider/keeper/grpc_query_test.go index 8283f11235..14e6e675e1 100644 --- a/x/ccv/provider/keeper/grpc_query_test.go +++ b/x/ccv/provider/keeper/grpc_query_test.go @@ -8,10 +8,10 @@ import ( sdktypes "github.com/cosmos/cosmos-sdk/types" - cryptotestutil "github.com/cosmos/interchain-security/v5/testutil/crypto" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + cryptotestutil "github.com/cosmos/interchain-security/v4/testutil/crypto" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) func TestQueryAllPairsValConAddrByConsumerChainID(t *testing.T) { diff --git a/x/ccv/provider/keeper/hooks.go b/x/ccv/provider/keeper/hooks.go index 763804868e..ed926f16c7 100644 --- a/x/ccv/provider/keeper/hooks.go +++ b/x/ccv/provider/keeper/hooks.go @@ -8,9 +8,9 @@ import ( v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // Wrapper struct diff --git a/x/ccv/provider/keeper/hooks_test.go b/x/ccv/provider/keeper/hooks_test.go index 5372fc37cd..931667fac4 100644 --- a/x/ccv/provider/keeper/hooks_test.go +++ b/x/ccv/provider/keeper/hooks_test.go @@ -15,9 +15,9 @@ import ( v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - cryptotestutil "github.com/cosmos/interchain-security/v5/testutil/crypto" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - providerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" + cryptotestutil "github.com/cosmos/interchain-security/v4/testutil/crypto" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + providerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" ) func TestValidatorConsensusKeyInUse(t *testing.T) { diff --git a/x/ccv/provider/keeper/keeper.go b/x/ccv/provider/keeper/keeper.go index e602c16e5e..bc3664bfd7 100644 --- a/x/ccv/provider/keeper/keeper.go +++ b/x/ccv/provider/keeper/keeper.go @@ -23,9 +23,9 @@ import ( "github.com/cometbft/cometbft/libs/log" - consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // Keeper defines the Cross-Chain Validation Provider Keeper diff --git a/x/ccv/provider/keeper/keeper_test.go b/x/ccv/provider/keeper/keeper_test.go index a66b7e3826..d172a96dba 100644 --- a/x/ccv/provider/keeper/keeper_test.go +++ b/x/ccv/provider/keeper/keeper_test.go @@ -16,10 +16,10 @@ import ( abci "github.com/cometbft/cometbft/abci/types" tmprotocrypto "github.com/cometbft/cometbft/proto/tendermint/crypto" - cryptotestutil "github.com/cosmos/interchain-security/v5/testutil/crypto" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + cryptotestutil "github.com/cosmos/interchain-security/v4/testutil/crypto" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) const consumer = "consumer" diff --git a/x/ccv/provider/keeper/key_assignment.go b/x/ccv/provider/keeper/key_assignment.go index cb359620b9..67f4d89fdd 100644 --- a/x/ccv/provider/keeper/key_assignment.go +++ b/x/ccv/provider/keeper/key_assignment.go @@ -11,8 +11,8 @@ import ( tmprotocrypto "github.com/cometbft/cometbft/proto/tendermint/crypto" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // ParseConsumerKey parses the ED25519 PubKey`consumerKey` from a JSON string diff --git a/x/ccv/provider/keeper/key_assignment_test.go b/x/ccv/provider/keeper/key_assignment_test.go index e721b39c33..abf7858d40 100644 --- a/x/ccv/provider/keeper/key_assignment_test.go +++ b/x/ccv/provider/keeper/key_assignment_test.go @@ -17,11 +17,11 @@ import ( abci "github.com/cometbft/cometbft/abci/types" tmprotocrypto "github.com/cometbft/cometbft/proto/tendermint/crypto" - cryptotestutil "github.com/cosmos/interchain-security/v5/testutil/crypto" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - providerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + cryptotestutil "github.com/cosmos/interchain-security/v4/testutil/crypto" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + providerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) const ChainID = "chainID" diff --git a/x/ccv/provider/keeper/msg_server.go b/x/ccv/provider/keeper/msg_server.go index ee17fd8228..1f7f51b589 100644 --- a/x/ccv/provider/keeper/msg_server.go +++ b/x/ccv/provider/keeper/msg_server.go @@ -11,8 +11,8 @@ import ( tmtypes "github.com/cometbft/cometbft/types" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) type msgServer struct { diff --git a/x/ccv/provider/keeper/params.go b/x/ccv/provider/keeper/params.go index 3834358b0b..f74baf656e 100644 --- a/x/ccv/provider/keeper/params.go +++ b/x/ccv/provider/keeper/params.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // GetTemplateClient returns the template client for provider proposals diff --git a/x/ccv/provider/keeper/params_test.go b/x/ccv/provider/keeper/params_test.go index ccbd8629d6..88175431c0 100644 --- a/x/ccv/provider/keeper/params_test.go +++ b/x/ccv/provider/keeper/params_test.go @@ -11,8 +11,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) // TestParams tests the getting/setting of provider ccv module params. diff --git a/x/ccv/provider/keeper/partial_set_security.go b/x/ccv/provider/keeper/partial_set_security.go index 9020a3db82..0d5177089a 100644 --- a/x/ccv/provider/keeper/partial_set_security.go +++ b/x/ccv/provider/keeper/partial_set_security.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) // HandleOptIn prepares validator `providerAddr` to opt in to `chainID` with an optional `consumerKey` consumer public key. diff --git a/x/ccv/provider/keeper/partial_set_security_test.go b/x/ccv/provider/keeper/partial_set_security_test.go index 42ff7a14ab..afbd420e7f 100644 --- a/x/ccv/provider/keeper/partial_set_security_test.go +++ b/x/ccv/provider/keeper/partial_set_security_test.go @@ -17,10 +17,10 @@ import ( "github.com/cometbft/cometbft/proto/tendermint/crypto" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) func TestHandleOptIn(t *testing.T) { diff --git a/x/ccv/provider/keeper/proposal.go b/x/ccv/provider/keeper/proposal.go index 67d3c91bca..1d2bf19a4f 100644 --- a/x/ccv/provider/keeper/proposal.go +++ b/x/ccv/provider/keeper/proposal.go @@ -18,8 +18,8 @@ import ( tmtypes "github.com/cometbft/cometbft/types" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // HandleConsumerAdditionProposal will receive the consumer chain's client state from the proposal. diff --git a/x/ccv/provider/keeper/proposal_test.go b/x/ccv/provider/keeper/proposal_test.go index 67b0f93778..9b769d2f94 100644 --- a/x/ccv/provider/keeper/proposal_test.go +++ b/x/ccv/provider/keeper/proposal_test.go @@ -17,11 +17,11 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - cryptotestutil "github.com/cosmos/interchain-security/v5/testutil/crypto" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - providerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + cryptotestutil "github.com/cosmos/interchain-security/v4/testutil/crypto" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + providerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // diff --git a/x/ccv/provider/keeper/relay.go b/x/ccv/provider/keeper/relay.go index f785d5d6b5..230ed0a96a 100644 --- a/x/ccv/provider/keeper/relay.go +++ b/x/ccv/provider/keeper/relay.go @@ -12,8 +12,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // OnRecvVSCMaturedPacket handles a VSCMatured packet and returns a no-op result ack. diff --git a/x/ccv/provider/keeper/relay_test.go b/x/ccv/provider/keeper/relay_test.go index 2b50c695bc..5f74d93424 100644 --- a/x/ccv/provider/keeper/relay_test.go +++ b/x/ccv/provider/keeper/relay_test.go @@ -20,13 +20,13 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - "github.com/cosmos/interchain-security/v5/testutil/crypto" - cryptotestutil "github.com/cosmos/interchain-security/v5/testutil/crypto" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/testutil/crypto" + cryptotestutil "github.com/cosmos/interchain-security/v4/testutil/crypto" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // TestQueueVSCPackets tests queueing validator set updates. diff --git a/x/ccv/provider/keeper/throttle.go b/x/ccv/provider/keeper/throttle.go index b1da78db0f..b7e7fd5941 100644 --- a/x/ccv/provider/keeper/throttle.go +++ b/x/ccv/provider/keeper/throttle.go @@ -10,7 +10,7 @@ import ( tmtypes "github.com/cometbft/cometbft/types" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) // Obtains the effective validator power relevant to a validator consensus address. diff --git a/x/ccv/provider/keeper/throttle_legacy.go b/x/ccv/provider/keeper/throttle_legacy.go index c14c994e84..6f347b8f60 100644 --- a/x/ccv/provider/keeper/throttle_legacy.go +++ b/x/ccv/provider/keeper/throttle_legacy.go @@ -5,8 +5,8 @@ import ( sdktypes "github.com/cosmos/cosmos-sdk/types" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // Pending packet data type enum, used to encode the type of packet data stored at each entry in the mutual queue. diff --git a/x/ccv/provider/keeper/throttle_test.go b/x/ccv/provider/keeper/throttle_test.go index 5a315e5ec9..478ec0f235 100644 --- a/x/ccv/provider/keeper/throttle_test.go +++ b/x/ccv/provider/keeper/throttle_test.go @@ -13,8 +13,8 @@ import ( tmtypes "github.com/cometbft/cometbft/types" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) // TestSlashMeterReplenishment tests the CheckForSlashMeterReplenishment, ReplenishSlashMeter, diff --git a/x/ccv/provider/keeper/validator_set_update.go b/x/ccv/provider/keeper/validator_set_update.go index 42016708a5..264fdd67f2 100644 --- a/x/ccv/provider/keeper/validator_set_update.go +++ b/x/ccv/provider/keeper/validator_set_update.go @@ -8,7 +8,7 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) // SetConsumerValidator sets provided consumer `validator` on the consumer chain with `chainID` diff --git a/x/ccv/provider/keeper/validator_set_update_test.go b/x/ccv/provider/keeper/validator_set_update_test.go index 9da3039b14..396a74fb1f 100644 --- a/x/ccv/provider/keeper/validator_set_update_test.go +++ b/x/ccv/provider/keeper/validator_set_update_test.go @@ -16,10 +16,10 @@ import ( "github.com/cometbft/cometbft/crypto/ed25519" "github.com/cometbft/cometbft/proto/tendermint/crypto" - cryptotestutil "github.com/cosmos/interchain-security/v5/testutil/crypto" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + cryptotestutil "github.com/cosmos/interchain-security/v4/testutil/crypto" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) // TestConsumerValidator tests the `SetConsumerValidator`, `IsConsumerValidator`, and `DeleteConsumerValidator` methods diff --git a/x/ccv/provider/migrations/migrator.go b/x/ccv/provider/migrations/migrator.go index ea6e9e00d5..c8b464a7a3 100644 --- a/x/ccv/provider/migrations/migrator.go +++ b/x/ccv/provider/migrations/migrator.go @@ -4,10 +4,10 @@ import ( sdktypes "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - providerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - v3 "github.com/cosmos/interchain-security/v5/x/ccv/provider/migrations/v3" - v4 "github.com/cosmos/interchain-security/v5/x/ccv/provider/migrations/v4" - v5 "github.com/cosmos/interchain-security/v5/x/ccv/provider/migrations/v5" + providerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + v3 "github.com/cosmos/interchain-security/v4/x/ccv/provider/migrations/v3" + v4 "github.com/cosmos/interchain-security/v4/x/ccv/provider/migrations/v4" + v5 "github.com/cosmos/interchain-security/v4/x/ccv/provider/migrations/v5" ) // Migrator is a struct for handling in-place store migrations. @@ -41,9 +41,9 @@ func (m Migrator) Migrate3to4(ctx sdktypes.Context) error { return nil } -// MigrateXtoY migrates x/ccvprovider state from consensus version X to Y. +// MigrateXtoY migrates x/ccvprovider state from consensus version 4 to 5. // The migration consists of setting a top N of 95 for all registered consumer chains. -func (m Migrator) MigrateXtoY(ctx sdktypes.Context) error { +func (m Migrator) Migrate4to5(ctx sdktypes.Context) error { v5.MigrateTopNForRegisteredChains(ctx, m.providerKeeper) return nil } diff --git a/x/ccv/provider/migrations/v3/migration_test.go b/x/ccv/provider/migrations/v3/migration_test.go index 56d6b617d9..630b8fd7dd 100644 --- a/x/ccv/provider/migrations/v3/migration_test.go +++ b/x/ccv/provider/migrations/v3/migration_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - testutil "github.com/cosmos/interchain-security/v5/testutil/keeper" + testutil "github.com/cosmos/interchain-security/v4/testutil/keeper" ) func TestMigrate2To3(t *testing.T) { diff --git a/x/ccv/provider/migrations/v3/migrations.go b/x/ccv/provider/migrations/v3/migrations.go index 2ffd1e6f25..d308316761 100644 --- a/x/ccv/provider/migrations/v3/migrations.go +++ b/x/ccv/provider/migrations/v3/migrations.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - providerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" + providerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" ) // MigrateQueuedPackets processes all queued packet data for all consumer chains that were stored diff --git a/x/ccv/provider/migrations/v4/migration_test.go b/x/ccv/provider/migrations/v4/migration_test.go index 4423842149..5ab5faf87a 100644 --- a/x/ccv/provider/migrations/v4/migration_test.go +++ b/x/ccv/provider/migrations/v4/migration_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - testutil "github.com/cosmos/interchain-security/v5/testutil/keeper" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + testutil "github.com/cosmos/interchain-security/v4/testutil/keeper" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) func TestMigrateParams(t *testing.T) { diff --git a/x/ccv/provider/migrations/v4/migrations.go b/x/ccv/provider/migrations/v4/migrations.go index e60c98700e..825d01e25d 100644 --- a/x/ccv/provider/migrations/v4/migrations.go +++ b/x/ccv/provider/migrations/v4/migrations.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) // MigrateParams adds missing provider chain params to the param store. diff --git a/x/ccv/provider/migrations/v5/migration_test.go b/x/ccv/provider/migrations/v5/migration_test.go index 907aa1b019..1adf57baeb 100644 --- a/x/ccv/provider/migrations/v5/migration_test.go +++ b/x/ccv/provider/migrations/v5/migration_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - testutil "github.com/cosmos/interchain-security/v5/testutil/keeper" + testutil "github.com/cosmos/interchain-security/v4/testutil/keeper" ) func TestMigrateParams(t *testing.T) { diff --git a/x/ccv/provider/migrations/v5/migrations.go b/x/ccv/provider/migrations/v5/migrations.go index aa228b6a09..748b35dd0e 100644 --- a/x/ccv/provider/migrations/v5/migrations.go +++ b/x/ccv/provider/migrations/v5/migrations.go @@ -3,7 +3,7 @@ package v5 import ( sdk "github.com/cosmos/cosmos-sdk/types" - providerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" + providerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" ) // This migration only takes already registered chains into account. diff --git a/x/ccv/provider/module.go b/x/ccv/provider/module.go index 85555af2c2..6b616f0de8 100644 --- a/x/ccv/provider/module.go +++ b/x/ccv/provider/module.go @@ -19,10 +19,10 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/client/cli" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/migrations" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/client/cli" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/migrations" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) var ( @@ -115,6 +115,9 @@ func (am AppModule) RegisterServices(cfg module.Configurator) { if err := cfg.RegisterMigration(providertypes.ModuleName, 3, m.Migrate3to4); err != nil { panic(fmt.Sprintf("failed to register migrator for %s: %s", providertypes.ModuleName, err)) } + if err := cfg.RegisterMigration(providertypes.ModuleName, 4, m.Migrate4to5); err != nil { + panic(fmt.Sprintf("failed to register migrator for %s: %s", providertypes.ModuleName, err)) + } } // InitGenesis performs genesis initialization for the provider module. It returns no validator updates. diff --git a/x/ccv/provider/module_test.go b/x/ccv/provider/module_test.go index 2dfdfc1598..869c24253f 100644 --- a/x/ccv/provider/module_test.go +++ b/x/ccv/provider/module_test.go @@ -11,10 +11,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/provider" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/provider" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // Tests the provider's InitGenesis implementation against the spec. diff --git a/x/ccv/provider/proposal_handler.go b/x/ccv/provider/proposal_handler.go index 2a4342ea20..50089a8ab5 100644 --- a/x/ccv/provider/proposal_handler.go +++ b/x/ccv/provider/proposal_handler.go @@ -7,8 +7,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) // NewProviderProposalHandler defines the handler for consumer addition, diff --git a/x/ccv/provider/proposal_handler_test.go b/x/ccv/provider/proposal_handler_test.go index e15036f565..185db25b07 100644 --- a/x/ccv/provider/proposal_handler_test.go +++ b/x/ccv/provider/proposal_handler_test.go @@ -12,9 +12,9 @@ import ( distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper" - "github.com/cosmos/interchain-security/v5/x/ccv/provider" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" + "github.com/cosmos/interchain-security/v4/x/ccv/provider" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) // TestProviderProposalHandler tests the highest level handler for proposals diff --git a/x/ccv/provider/types/consumer.go b/x/ccv/provider/types/consumer.go index 02651ac03e..4c43bd58e7 100644 --- a/x/ccv/provider/types/consumer.go +++ b/x/ccv/provider/types/consumer.go @@ -1,7 +1,7 @@ package types import ( - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) func NewConsumerStates( diff --git a/x/ccv/provider/types/genesis.go b/x/ccv/provider/types/genesis.go index 00802558c5..ae929ba541 100644 --- a/x/ccv/provider/types/genesis.go +++ b/x/ccv/provider/types/genesis.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) func NewGenesisState( diff --git a/x/ccv/provider/types/genesis.pb.go b/x/ccv/provider/types/genesis.pb.go index d7d225b762..d5041f1b10 100644 --- a/x/ccv/provider/types/genesis.pb.go +++ b/x/ccv/provider/types/genesis.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - types "github.com/cosmos/interchain-security/v5/x/ccv/types" + types "github.com/cosmos/interchain-security/v4/x/ccv/types" io "io" math "math" math_bits "math/bits" diff --git a/x/ccv/provider/types/genesis_test.go b/x/ccv/provider/types/genesis_test.go index d682e93897..41a716757f 100644 --- a/x/ccv/provider/types/genesis_test.go +++ b/x/ccv/provider/types/genesis_test.go @@ -14,9 +14,9 @@ import ( abci "github.com/cometbft/cometbft/abci/types" tmtypes "github.com/cometbft/cometbft/types" - "github.com/cosmos/interchain-security/v5/testutil/crypto" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" - ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/testutil/crypto" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" + ccv "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // Tests validation of consumer states and params within a provider genesis state diff --git a/x/ccv/provider/types/key_assignment.go b/x/ccv/provider/types/key_assignment.go index ee403e1e49..04192ae53a 100644 --- a/x/ccv/provider/types/key_assignment.go +++ b/x/ccv/provider/types/key_assignment.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // A validator's consensus address on the provider chain. diff --git a/x/ccv/provider/types/keys.go b/x/ccv/provider/types/keys.go index 4126a58cb7..14521b9289 100644 --- a/x/ccv/provider/types/keys.go +++ b/x/ccv/provider/types/keys.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) type Status int diff --git a/x/ccv/provider/types/keys_test.go b/x/ccv/provider/types/keys_test.go index 78d8b4f806..eac11a0993 100644 --- a/x/ccv/provider/types/keys_test.go +++ b/x/ccv/provider/types/keys_test.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - cryptoutil "github.com/cosmos/interchain-security/v5/testutil/crypto" - providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + cryptoutil "github.com/cosmos/interchain-security/v4/testutil/crypto" + providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) // Tests that all singular keys, or prefixes to fully resolves keys are non duplicate byte values. diff --git a/x/ccv/provider/types/msg.go b/x/ccv/provider/types/msg.go index b6546506fd..b80e608785 100644 --- a/x/ccv/provider/types/msg.go +++ b/x/ccv/provider/types/msg.go @@ -14,7 +14,7 @@ import ( tmtypes "github.com/cometbft/cometbft/proto/tendermint/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) // provider message types diff --git a/x/ccv/provider/types/params.go b/x/ccv/provider/types/params.go index c398188c98..a0a7a5ed7a 100644 --- a/x/ccv/provider/types/params.go +++ b/x/ccv/provider/types/params.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) const ( diff --git a/x/ccv/provider/types/params_test.go b/x/ccv/provider/types/params_test.go index b86dd0cddf..4e72c233af 100644 --- a/x/ccv/provider/types/params_test.go +++ b/x/ccv/provider/types/params_test.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) func TestValidateParams(t *testing.T) { diff --git a/x/ccv/provider/types/proposal.go b/x/ccv/provider/types/proposal.go index d2cfa7ed3f..fa6483acd1 100644 --- a/x/ccv/provider/types/proposal.go +++ b/x/ccv/provider/types/proposal.go @@ -14,7 +14,7 @@ import ( evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" + ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types" ) const ( diff --git a/x/ccv/provider/types/proposal_test.go b/x/ccv/provider/types/proposal_test.go index a2f8f574ee..465a376b47 100644 --- a/x/ccv/provider/types/proposal_test.go +++ b/x/ccv/provider/types/proposal_test.go @@ -15,7 +15,7 @@ import ( govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" + "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" ) func TestConsumerAdditionProposalValidateBasic(t *testing.T) { diff --git a/x/ccv/provider/types/provider.pb.go b/x/ccv/provider/types/provider.pb.go index 07e511669c..4f0a2fd605 100644 --- a/x/ccv/provider/types/provider.pb.go +++ b/x/ccv/provider/types/provider.pb.go @@ -15,7 +15,7 @@ import ( github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" types "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" _07_tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - types3 "github.com/cosmos/interchain-security/v5/x/ccv/types" + types3 "github.com/cosmos/interchain-security/v4/x/ccv/types" _ "google.golang.org/protobuf/types/known/durationpb" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" diff --git a/x/ccv/provider/types/query.pb.go b/x/ccv/provider/types/query.pb.go index 099c2be2db..dbca4d229d 100644 --- a/x/ccv/provider/types/query.pb.go +++ b/x/ccv/provider/types/query.pb.go @@ -13,7 +13,7 @@ import ( grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - types "github.com/cosmos/interchain-security/v5/x/ccv/types" + types "github.com/cosmos/interchain-security/v4/x/ccv/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/x/ccv/types/utils_test.go b/x/ccv/types/utils_test.go index 44f4ff6d27..f7ecd83197 100644 --- a/x/ccv/types/utils_test.go +++ b/x/ccv/types/utils_test.go @@ -10,7 +10,7 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/x/ccv/types" ) func TestAccumulateChanges(t *testing.T) { diff --git a/x/ccv/types/wire_test.go b/x/ccv/types/wire_test.go index 93512a5218..ab6692912e 100644 --- a/x/ccv/types/wire_test.go +++ b/x/ccv/types/wire_test.go @@ -12,8 +12,8 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - "github.com/cosmos/interchain-security/v5/testutil/crypto" - "github.com/cosmos/interchain-security/v5/x/ccv/types" + "github.com/cosmos/interchain-security/v4/testutil/crypto" + "github.com/cosmos/interchain-security/v4/x/ccv/types" ) func TestPacketDataValidateBasic(t *testing.T) {