Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor!: upgrade ICS imports to v2 #974

Merged
merged 2 commits into from
May 25, 2023
Merged

refactor!: upgrade ICS imports to v2 #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c5cf77
v2 imports
shaspitz May 23, 2023
729fb54
Update CHANGELOG.md
shaspitz May 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@

Add an entry to the unreleased section whenever merging a PR to main that is not targeted at a specific release. These entries will eventually be included in a release.

## v.1.3.0
## v.2.0.0

Date: May 12th, 2023

Unlike prior releases, the ICS v1.3.0 release will be based on the main branch. v1.3.0 will contain all the accumulated PRs from the various releases below, along with other PRs that were merged, but not released to production. After v1.3.0, we plan to revamp release practices, and how we modularize the repo for consumer/provider.
Unlike prior releases, the ICS v2.0.0 release will be based on the main branch. v2.0.0 will contain all the accumulated PRs from the various releases below, along with other PRs that were merged, but not released to production. After v2.0.0, we plan to revamp release practices, and how we modularize the repo for consumer/provider.

Some PRs from v1.3.0 may reappear from other releases below. This is due to the fact that ICS v1.1.0 deviates from the commit ordering of the main branch, and other releases thereafter are based on v1.1.0.
Some PRs from v2.0.0 may reappear from other releases below. This is due to the fact that ICS v1.1.0 deviates from the commit ordering of the main branch, and other releases thereafter are based on v1.1.0.

### High level changes included in v1.3.0
### High level changes included in v2.0.0

* MVP for standalone to consumer changeover, see [EPIC](https://github.com/cosmos/interchain-security/issues/756)
* MVP for soft opt out, see [EPIC](https://github.com/cosmos/interchain-security/issues/851)
* Various fixes, critical and non-critical
* Docs updates which should not affect production code

## PRs included in v1.3.0
## PRs included in v2.0.0

* (fix) Remove panics on failure to send IBC packets [#876](https://github.com/cosmos/interchain-security/pull/876)
* (fix) consumer key prefix order to avoid complex migrations [#963](https://github.com/cosmos/interchain-security/pull/963)
Expand Down
4 changes: 2 additions & 2 deletions app/consumer-democracy/ante/forbidden_proposals_ante_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
"github.com/cosmos/cosmos-sdk/x/params/types/proposal"
app "github.com/cosmos/interchain-security/app/consumer-democracy"
"github.com/cosmos/interchain-security/app/consumer-democracy/ante"
app "github.com/cosmos/interchain-security/v2/app/consumer-democracy"
"github.com/cosmos/interchain-security/v2/app/consumer-democracy/ante"
"github.com/stretchr/testify/require"
)

Expand Down
6 changes: 3 additions & 3 deletions app/consumer-democracy/ante_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"github.com/cosmos/cosmos-sdk/x/auth/ante"
ibcante "github.com/cosmos/ibc-go/v4/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
democracyante "github.com/cosmos/interchain-security/app/consumer-democracy/ante"
consumerante "github.com/cosmos/interchain-security/app/consumer/ante"
ibcconsumerkeeper "github.com/cosmos/interchain-security/x/ccv/consumer/keeper"
democracyante "github.com/cosmos/interchain-security/v2/app/consumer-democracy/ante"
consumerante "github.com/cosmos/interchain-security/v2/app/consumer/ante"
ibcconsumerkeeper "github.com/cosmos/interchain-security/v2/x/ccv/consumer/keeper"
)

// HandlerOptions extend the SDK's AnteHandler options by requiring the IBC
Expand Down
20 changes: 10 additions & 10 deletions app/consumer-democracy/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"path/filepath"

genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
appparams "github.com/cosmos/interchain-security/app/params"
appparams "github.com/cosmos/interchain-security/v2/app/params"

"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
Expand Down Expand Up @@ -73,8 +73,8 @@ import (
porttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types"
ibchost "github.com/cosmos/ibc-go/v4/modules/core/24-host"
ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
ibctestingcore "github.com/cosmos/interchain-security/legacy_ibc_testing/core"
ibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing"
ibctestingcore "github.com/cosmos/interchain-security/v2/legacy_ibc_testing/core"
ibctesting "github.com/cosmos/interchain-security/v2/legacy_ibc_testing/testing"
"github.com/gorilla/mux"
"github.com/rakyll/statik/fs"
"github.com/spf13/cast"
Expand All @@ -89,27 +89,27 @@ import (
distrclient "github.com/cosmos/cosmos-sdk/x/distribution/client"
distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper"
distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
testutil "github.com/cosmos/interchain-security/testutil/integration"
ccvdistr "github.com/cosmos/interchain-security/x/ccv/democracy/distribution"
testutil "github.com/cosmos/interchain-security/v2/testutil/integration"
ccvdistr "github.com/cosmos/interchain-security/v2/x/ccv/democracy/distribution"

stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
ccvstaking "github.com/cosmos/interchain-security/x/ccv/democracy/staking"
ccvstaking "github.com/cosmos/interchain-security/v2/x/ccv/democracy/staking"

gov "github.com/cosmos/cosmos-sdk/x/gov"
govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
ccvgov "github.com/cosmos/interchain-security/x/ccv/democracy/governance"
ccvgov "github.com/cosmos/interchain-security/v2/x/ccv/democracy/governance"

// add mint
mint "github.com/cosmos/cosmos-sdk/x/mint"
mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper"
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"

paramproposal "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
consumer "github.com/cosmos/interchain-security/x/ccv/consumer"
consumerkeeper "github.com/cosmos/interchain-security/x/ccv/consumer/keeper"
consumertypes "github.com/cosmos/interchain-security/x/ccv/consumer/types"
consumer "github.com/cosmos/interchain-security/v2/x/ccv/consumer"
consumerkeeper "github.com/cosmos/interchain-security/v2/x/ccv/consumer/keeper"
consumertypes "github.com/cosmos/interchain-security/v2/x/ccv/consumer/types"

// unnamed import of statik for swagger UI support
_ "github.com/cosmos/cosmos-sdk/client/docs/statik"
Expand Down
6 changes: 3 additions & 3 deletions app/consumer-democracy/proposals_whitelisting_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package app_test
import (
"testing"

appConsumer "github.com/cosmos/interchain-security/app/consumer-democracy"
ibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing"
icstestingutils "github.com/cosmos/interchain-security/testutil/ibc_testing"
appConsumer "github.com/cosmos/interchain-security/v2/app/consumer-democracy"
ibctesting "github.com/cosmos/interchain-security/v2/legacy_ibc_testing/testing"
icstestingutils "github.com/cosmos/interchain-security/v2/testutil/ibc_testing"
"github.com/stretchr/testify/require"
)

Expand Down
4 changes: 2 additions & 2 deletions app/consumer/ante/disabled_modules_ante_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types"
"github.com/cosmos/interchain-security/app/consumer/ante"
"github.com/cosmos/interchain-security/app/params"
"github.com/cosmos/interchain-security/v2/app/consumer/ante"
"github.com/cosmos/interchain-security/v2/app/params"
"github.com/stretchr/testify/require"
)

Expand Down
4 changes: 2 additions & 2 deletions app/consumer/ante/msg_filter_ante_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types"
"github.com/cosmos/interchain-security/app/consumer/ante"
"github.com/cosmos/interchain-security/app/params"
"github.com/cosmos/interchain-security/v2/app/consumer/ante"
"github.com/cosmos/interchain-security/v2/app/params"
"github.com/stretchr/testify/require"
)

Expand Down
4 changes: 2 additions & 2 deletions app/consumer/ante_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/cosmos/cosmos-sdk/x/auth/ante"
ibcante "github.com/cosmos/ibc-go/v4/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
consumerante "github.com/cosmos/interchain-security/app/consumer/ante"
ibcconsumerkeeper "github.com/cosmos/interchain-security/x/ccv/consumer/keeper"
consumerante "github.com/cosmos/interchain-security/v2/app/consumer/ante"
ibcconsumerkeeper "github.com/cosmos/interchain-security/v2/x/ccv/consumer/keeper"
)

// HandlerOptions extend the SDK's AnteHandler options by requiring the IBC
Expand Down
14 changes: 7 additions & 7 deletions app/consumer/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ import (
porttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types"
ibchost "github.com/cosmos/ibc-go/v4/modules/core/24-host"
ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
appparams "github.com/cosmos/interchain-security/app/params"
ibctestingcore "github.com/cosmos/interchain-security/legacy_ibc_testing/core"
ibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing"
appparams "github.com/cosmos/interchain-security/v2/app/params"
ibctestingcore "github.com/cosmos/interchain-security/v2/legacy_ibc_testing/core"
ibctesting "github.com/cosmos/interchain-security/v2/legacy_ibc_testing/testing"
"github.com/gorilla/mux"
"github.com/rakyll/statik/fs"
"github.com/spf13/cast"
Expand All @@ -79,13 +79,13 @@ import (
tmos "github.com/tendermint/tendermint/libs/os"
dbm "github.com/tendermint/tm-db"

ibcconsumer "github.com/cosmos/interchain-security/x/ccv/consumer"
ibcconsumerkeeper "github.com/cosmos/interchain-security/x/ccv/consumer/keeper"
ibcconsumertypes "github.com/cosmos/interchain-security/x/ccv/consumer/types"
ibcconsumer "github.com/cosmos/interchain-security/v2/x/ccv/consumer"
ibcconsumerkeeper "github.com/cosmos/interchain-security/v2/x/ccv/consumer/keeper"
ibcconsumertypes "github.com/cosmos/interchain-security/v2/x/ccv/consumer/types"

// unnamed import of statik for swagger UI support
_ "github.com/cosmos/cosmos-sdk/client/docs/statik"
testutil "github.com/cosmos/interchain-security/testutil/integration"
testutil "github.com/cosmos/interchain-security/v2/testutil/integration"
)

const (
Expand Down
16 changes: 8 additions & 8 deletions app/provider/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"
"path/filepath"

appparams "github.com/cosmos/interchain-security/app/params"
appparams "github.com/cosmos/interchain-security/v2/app/params"

"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
Expand Down Expand Up @@ -84,8 +84,8 @@ import (
porttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types"
ibchost "github.com/cosmos/ibc-go/v4/modules/core/24-host"
ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
ibctestingcore "github.com/cosmos/interchain-security/legacy_ibc_testing/core"
ibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing"
ibctestingcore "github.com/cosmos/interchain-security/v2/legacy_ibc_testing/core"
ibctesting "github.com/cosmos/interchain-security/v2/legacy_ibc_testing/testing"

"github.com/gorilla/mux"
"github.com/rakyll/statik/fs"
Expand All @@ -96,12 +96,12 @@ import (
tmos "github.com/tendermint/tendermint/libs/os"
dbm "github.com/tendermint/tm-db"

ibcprovider "github.com/cosmos/interchain-security/x/ccv/provider"
ibcproviderclient "github.com/cosmos/interchain-security/x/ccv/provider/client"
ibcproviderkeeper "github.com/cosmos/interchain-security/x/ccv/provider/keeper"
providertypes "github.com/cosmos/interchain-security/x/ccv/provider/types"
ibcprovider "github.com/cosmos/interchain-security/v2/x/ccv/provider"
ibcproviderclient "github.com/cosmos/interchain-security/v2/x/ccv/provider/client"
ibcproviderkeeper "github.com/cosmos/interchain-security/v2/x/ccv/provider/keeper"
providertypes "github.com/cosmos/interchain-security/v2/x/ccv/provider/types"

testutil "github.com/cosmos/interchain-security/testutil/integration"
testutil "github.com/cosmos/interchain-security/v2/testutil/integration"

// unnamed import of statik for swagger UI support
_ "github.com/cosmos/cosmos-sdk/client/docs/statik"
Expand Down
4 changes: 2 additions & 2 deletions cmd/interchain-security-cd/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/cosmos/cosmos-sdk/x/crisis"
genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
simapp "github.com/cosmos/interchain-security/app/consumer"
"github.com/cosmos/interchain-security/app/params"
simapp "github.com/cosmos/interchain-security/v2/app/consumer"
"github.com/cosmos/interchain-security/v2/app/params"
)

// NewRootCmd creates a new root command for simd. It is called once in the
Expand Down
4 changes: 2 additions & 2 deletions cmd/interchain-security-cd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/cosmos/cosmos-sdk/server"
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
app "github.com/cosmos/interchain-security/app/consumer"
"github.com/cosmos/interchain-security/cmd/interchain-security-cd/cmd"
app "github.com/cosmos/interchain-security/v2/app/consumer"
"github.com/cosmos/interchain-security/v2/cmd/interchain-security-cd/cmd"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/interchain-security-cdd/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/cosmos/cosmos-sdk/x/crisis"
genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
simapp "github.com/cosmos/interchain-security/app/consumer-democracy"
"github.com/cosmos/interchain-security/app/params"
simapp "github.com/cosmos/interchain-security/v2/app/consumer-democracy"
"github.com/cosmos/interchain-security/v2/app/params"
)

// NewRootCmd creates a new root command for simd. It is called once in the
Expand Down
4 changes: 2 additions & 2 deletions cmd/interchain-security-cdd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/cosmos/cosmos-sdk/server"
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
app "github.com/cosmos/interchain-security/app/consumer-democracy"
"github.com/cosmos/interchain-security/cmd/interchain-security-cdd/cmd"
app "github.com/cosmos/interchain-security/v2/app/consumer-democracy"
"github.com/cosmos/interchain-security/v2/cmd/interchain-security-cdd/cmd"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/interchain-security-pd/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/cosmos/cosmos-sdk/x/crisis"
genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
"github.com/cosmos/interchain-security/app/params"
simapp "github.com/cosmos/interchain-security/app/provider"
"github.com/cosmos/interchain-security/v2/app/params"
simapp "github.com/cosmos/interchain-security/v2/app/provider"
)

// NewRootCmd creates a new root command for simd. It is called once in the
Expand Down
4 changes: 2 additions & 2 deletions cmd/interchain-security-pd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/cosmos/cosmos-sdk/server"
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
app "github.com/cosmos/interchain-security/app/provider"
"github.com/cosmos/interchain-security/cmd/interchain-security-pd/cmd"
app "github.com/cosmos/interchain-security/v2/app/provider"
"github.com/cosmos/interchain-security/v2/cmd/interchain-security-pd/cmd"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/cosmos/interchain-security
module github.com/cosmos/interchain-security/v2

go 1.19

Expand Down
2 changes: 1 addition & 1 deletion legacy_ibc_testing/simapp/test_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
tmtypes "github.com/tendermint/tendermint/types"

"github.com/cosmos/interchain-security/legacy_ibc_testing/simapp/helpers"
"github.com/cosmos/interchain-security/v2/legacy_ibc_testing/simapp/helpers"
)

/*
Expand Down
4 changes: 2 additions & 2 deletions legacy_ibc_testing/testing/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"
"time"

"github.com/cosmos/interchain-security/legacy_ibc_testing/core"
"github.com/cosmos/interchain-security/v2/legacy_ibc_testing/core"

"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
Expand All @@ -24,7 +24,7 @@ import (

"github.com/cosmos/ibc-go/v4/modules/core/keeper"

"github.com/cosmos/interchain-security/legacy_ibc_testing/simapp"
"github.com/cosmos/interchain-security/v2/legacy_ibc_testing/simapp"
)

/*
Expand Down
4 changes: 2 additions & 2 deletions legacy_ibc_testing/testing/chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import (
"github.com/cosmos/ibc-go/v4/modules/core/types"
ibctmtypes "github.com/cosmos/ibc-go/v4/modules/light-clients/07-tendermint/types"
"github.com/cosmos/ibc-go/v4/testing/mock"
ibctestingcore "github.com/cosmos/interchain-security/legacy_ibc_testing/core"
"github.com/cosmos/interchain-security/legacy_ibc_testing/simapp"
ibctestingcore "github.com/cosmos/interchain-security/v2/legacy_ibc_testing/core"
"github.com/cosmos/interchain-security/v2/legacy_ibc_testing/simapp"
)

/*
Expand Down
12 changes: 6 additions & 6 deletions tests/difference/core/driver/core_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ import (
"github.com/stretchr/testify/suite"

channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types"
ibctestingcore "github.com/cosmos/interchain-security/legacy_ibc_testing/core"
ibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing"
ibctestingcore "github.com/cosmos/interchain-security/v2/legacy_ibc_testing/core"
ibctesting "github.com/cosmos/interchain-security/v2/legacy_ibc_testing/testing"

stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
appConsumer "github.com/cosmos/interchain-security/app/consumer"
appProvider "github.com/cosmos/interchain-security/app/provider"
appConsumer "github.com/cosmos/interchain-security/v2/app/consumer"
appProvider "github.com/cosmos/interchain-security/v2/app/provider"

simibc "github.com/cosmos/interchain-security/testutil/simibc"
simibc "github.com/cosmos/interchain-security/v2/testutil/simibc"

slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
consumerkeeper "github.com/cosmos/interchain-security/x/ccv/consumer/keeper"
consumerkeeper "github.com/cosmos/interchain-security/v2/x/ccv/consumer/keeper"
)

type CoreSuite struct {
Expand Down
20 changes: 10 additions & 10 deletions tests/difference/core/driver/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
tmtypes "github.com/tendermint/tendermint/types"

ibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing"
ibctesting "github.com/cosmos/interchain-security/v2/legacy_ibc_testing/testing"

cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
Expand All @@ -32,15 +32,15 @@ import (
slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
appConsumer "github.com/cosmos/interchain-security/app/consumer"
appProvider "github.com/cosmos/interchain-security/app/provider"
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"
appConsumer "github.com/cosmos/interchain-security/v2/app/consumer"
appProvider "github.com/cosmos/interchain-security/v2/app/provider"
icstestingutils "github.com/cosmos/interchain-security/v2/testutil/ibc_testing"
simibc "github.com/cosmos/interchain-security/v2/testutil/simibc"
consumerkeeper "github.com/cosmos/interchain-security/v2/x/ccv/consumer/keeper"
consumertypes "github.com/cosmos/interchain-security/v2/x/ccv/consumer/types"
providerkeeper "github.com/cosmos/interchain-security/v2/x/ccv/provider/keeper"

ccv "github.com/cosmos/interchain-security/v2/x/ccv/types"
)

type Builder struct {
Expand Down
Loading