diff --git a/go.mod b/go.mod index bdba3484bd..b8c7266ed4 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.18 require ( github.com/cosmos/cosmos-sdk v0.45.11 + github.com/cosmos/interchain-security/provider v0.0.0 github.com/gogo/protobuf v1.3.3 github.com/golang/protobuf v1.5.2 github.com/gorilla/mux v1.8.0 @@ -141,4 +142,5 @@ replace ( github.com/stretchr/testify => github.com/stretchr/testify v1.7.1 github.com/tendermint/tendermint => github.com/informalsystems/tendermint v0.34.26 google.golang.org/grpc => google.golang.org/grpc v1.33.2 + github.com/cosmos/interchain-security/provider => ./provider ) diff --git a/proto/interchain_security/ccv/provider/v1/genesis.proto b/proto/interchain_security/ccv/provider/v1/genesis.proto index 1bbdee1498..3100157f98 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/x/ccv/provider/types"; +option go_package = "github.com/cosmos/interchain-security/provider/x/ccv/types"; import "gogoproto/gogo.proto"; import "interchain_security/ccv/v1/ccv.proto"; diff --git a/proto/interchain_security/ccv/provider/v1/provider.proto b/proto/interchain_security/ccv/provider/v1/provider.proto index 16f3a7bff6..aae248f802 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/x/ccv/provider/types"; +option go_package = "github.com/cosmos/interchain-security/provider/x/ccv/types"; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; diff --git a/proto/interchain_security/ccv/provider/v1/query.proto b/proto/interchain_security/ccv/provider/v1/query.proto index b1ef9a620c..d4e7190c91 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/x/ccv/provider/types"; +option go_package = "github.com/cosmos/interchain-security/provider/x/ccv/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 567a7d9daa..764728b6dc 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/x/ccv/provider/types"; +option go_package = "github.com/cosmos/interchain-security/provider/x/ccv/types"; import "google/api/annotations.proto"; import "gogoproto/gogo.proto"; diff --git a/tests/difference/core/driver/setup.go b/tests/difference/core/driver/setup.go index cb4ffdd75f..ae3d35b09f 100644 --- a/tests/difference/core/driver/setup.go +++ b/tests/difference/core/driver/setup.go @@ -34,11 +34,11 @@ import ( stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" appConsumer "github.com/cosmos/interchain-security/app/consumer" appProvider "github.com/cosmos/interchain-security/provider/app" + providerkeeper "github.com/cosmos/interchain-security/provider/x/ccv/keeper" icstestingutils "github.com/cosmos/interchain-security/testutil/ibc_testing" simibc "github.com/cosmos/interchain-security/testutil/simibc" consumerkeeper "github.com/cosmos/interchain-security/x/ccv/consumer/keeper" consumertypes "github.com/cosmos/interchain-security/x/ccv/consumer/types" - providerkeeper "github.com/cosmos/interchain-security/x/ccv/provider/keeper" ccv "github.com/cosmos/interchain-security/x/ccv/types" ) diff --git a/tests/e2e/common.go b/tests/e2e/common.go index 5e2390b887..8260e8af38 100644 --- a/tests/e2e/common.go +++ b/tests/e2e/common.go @@ -14,9 +14,9 @@ import ( "github.com/cosmos/ibc-go/v4/modules/core/exported" ibctm "github.com/cosmos/ibc-go/v4/modules/light-clients/07-tendermint/types" ibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing" + providertypes "github.com/cosmos/interchain-security/provider/x/ccv/types" "github.com/cosmos/interchain-security/testutil/e2e" icstestingutils "github.com/cosmos/interchain-security/testutil/ibc_testing" - providertypes "github.com/cosmos/interchain-security/x/ccv/provider/types" ccv "github.com/cosmos/interchain-security/x/ccv/types" "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" diff --git a/tests/e2e/key_assignment.go b/tests/e2e/key_assignment.go index 2e1bfea7dc..001b678d7b 100644 --- a/tests/e2e/key_assignment.go +++ b/tests/e2e/key_assignment.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/cosmos/ibc-go/v4/testing/mock" - providerkeeper "github.com/cosmos/interchain-security/x/ccv/provider/keeper" + providerkeeper "github.com/cosmos/interchain-security/provider/x/ccv/keeper" ccv "github.com/cosmos/interchain-security/x/ccv/types" tmencoding "github.com/tendermint/tendermint/crypto/encoding" tmprotocrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" diff --git a/tests/e2e/stop_consumer.go b/tests/e2e/stop_consumer.go index 1a8e80eac5..dde996dd28 100644 --- a/tests/e2e/stop_consumer.go +++ b/tests/e2e/stop_consumer.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" - "github.com/cosmos/interchain-security/x/ccv/provider/types" + "github.com/cosmos/interchain-security/provider/x/ccv/types" ccv "github.com/cosmos/interchain-security/x/ccv/types" abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/tests/e2e/throttle.go b/tests/e2e/throttle.go index db1fbdbe99..1e51fda181 100644 --- a/tests/e2e/throttle.go +++ b/tests/e2e/throttle.go @@ -7,8 +7,8 @@ import ( sdktypes "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + providertypes "github.com/cosmos/interchain-security/provider/x/ccv/types" icstestingutils "github.com/cosmos/interchain-security/testutil/ibc_testing" - providertypes "github.com/cosmos/interchain-security/x/ccv/provider/types" ccvtypes "github.com/cosmos/interchain-security/x/ccv/types" tmtypes "github.com/tendermint/tendermint/types" ) diff --git a/tests/e2e/unbonding.go b/tests/e2e/unbonding.go index b5b02d896e..b9b7746547 100644 --- a/tests/e2e/unbonding.go +++ b/tests/e2e/unbonding.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - providerkeeper "github.com/cosmos/interchain-security/x/ccv/provider/keeper" + providerkeeper "github.com/cosmos/interchain-security/provider/x/ccv/keeper" ccv "github.com/cosmos/interchain-security/x/ccv/types" ) diff --git a/tests/integration/actions.go b/tests/integration/actions.go index beec0b1f08..64a6024659 100644 --- a/tests/integration/actions.go +++ b/tests/integration/actions.go @@ -15,8 +15,8 @@ import ( clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" consumertypes "github.com/cosmos/interchain-security/x/ccv/consumer/types" - "github.com/cosmos/interchain-security/x/ccv/provider/client" - "github.com/cosmos/interchain-security/x/ccv/provider/types" + "github.com/cosmos/interchain-security/provider/x/ccv/client" + "github.com/cosmos/interchain-security/provider/x/ccv/types" "github.com/tidwall/gjson" ) diff --git a/testutil/e2e/interfaces.go b/testutil/e2e/interfaces.go index a5b8e1962f..7310dbf7b3 100644 --- a/testutil/e2e/interfaces.go +++ b/testutil/e2e/interfaces.go @@ -14,8 +14,8 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" "github.com/cosmos/cosmos-sdk/x/staking/types" ibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing" + providerkeeper "github.com/cosmos/interchain-security/provider/x/ccv/keeper" consumerkeeper "github.com/cosmos/interchain-security/x/ccv/consumer/keeper" - providerkeeper "github.com/cosmos/interchain-security/x/ccv/provider/keeper" ccvtypes "github.com/cosmos/interchain-security/x/ccv/types" abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/testutil/keeper/unit_test_helpers.go b/testutil/keeper/unit_test_helpers.go index 3dd5d98299..1060de032e 100644 --- a/testutil/keeper/unit_test_helpers.go +++ b/testutil/keeper/unit_test_helpers.go @@ -15,10 +15,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + providerkeeper "github.com/cosmos/interchain-security/provider/x/ccv/keeper" + providertypes "github.com/cosmos/interchain-security/provider/x/ccv/types" consumerkeeper "github.com/cosmos/interchain-security/x/ccv/consumer/keeper" consumertypes "github.com/cosmos/interchain-security/x/ccv/consumer/types" - providerkeeper "github.com/cosmos/interchain-security/x/ccv/provider/keeper" - providertypes "github.com/cosmos/interchain-security/x/ccv/provider/types" "github.com/cosmos/interchain-security/x/ccv/types" ccvtypes "github.com/cosmos/interchain-security/x/ccv/types" "github.com/golang/mock/gomock"