diff --git a/e2e/dockerutil/dockerutil.go b/e2e/dockerutil/dockerutil.go index 1dc2934e513..4d75f685f5e 100644 --- a/e2e/dockerutil/dockerutil.go +++ b/e2e/dockerutil/dockerutil.go @@ -22,7 +22,7 @@ func GetTestContainers(t *testing.T, ctx context.Context, dc *dockerclient.Clien testContainers, err := dc.ContainerList(ctx, dockertypes.ContainerListOptions{ All: true, Filters: filters.NewArgs( - // see: https://github.com/DimitrisJim/ictest/blob/0bdc194c2aa11aa32479f32b19e1c50304301981/internal/dockerutil/setup.go#L31-L36 + // see: https://github.com/strangelove-ventures/interchaintest/blob/0bdc194c2aa11aa32479f32b19e1c50304301981/internal/dockerutil/setup.go#L31-L36 // for the label needed to identify test containers. filters.Arg("label", testLabel+"="+t.Name()), ), diff --git a/e2e/relayer/relayer.go b/e2e/relayer/relayer.go index a77a3037e47..c3f58c062c8 100644 --- a/e2e/relayer/relayer.go +++ b/e2e/relayer/relayer.go @@ -4,10 +4,10 @@ import ( "fmt" "testing" - interchaintest "github.com/DimitrisJim/ictest/v7" - "github.com/DimitrisJim/ictest/v7/ibc" - "github.com/DimitrisJim/ictest/v7/relayer" dockerclient "github.com/docker/docker/client" + interchaintest "github.com/strangelove-ventures/interchaintest/v7" + "github.com/strangelove-ventures/interchaintest/v7/ibc" + "github.com/strangelove-ventures/interchaintest/v7/relayer" "go.uber.org/zap" ) diff --git a/e2e/testconfig/testconfig.go b/e2e/testconfig/testconfig.go index ce383bb5ac9..48e54dfb5f3 100644 --- a/e2e/testconfig/testconfig.go +++ b/e2e/testconfig/testconfig.go @@ -7,8 +7,6 @@ import ( "path" "strings" - "github.com/DimitrisJim/ictest/v7/ibc" - interchaintestutil "github.com/DimitrisJim/ictest/v7/testutil" tmjson "github.com/cometbft/cometbft/libs/json" tmtypes "github.com/cometbft/cometbft/types" "github.com/cosmos/cosmos-sdk/codec" @@ -18,6 +16,8 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" + "github.com/strangelove-ventures/interchaintest/v7/ibc" + interchaintestutil "github.com/strangelove-ventures/interchaintest/v7/testutil" "gopkg.in/yaml.v2" "github.com/cosmos/ibc-go/e2e/relayer" diff --git a/e2e/tests/core/03-connection/connection_test.go b/e2e/tests/core/03-connection/connection_test.go index e29b4c98da2..1694bc2e0ce 100644 --- a/e2e/tests/core/03-connection/connection_test.go +++ b/e2e/tests/core/03-connection/connection_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/DimitrisJim/ictest/v7/ibc" - test "github.com/DimitrisJim/ictest/v7/testutil" paramsproposaltypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal" + "github.com/strangelove-ventures/interchaintest/v7/ibc" + test "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/suite" "github.com/cosmos/ibc-go/e2e/testsuite" diff --git a/e2e/tests/core/client_test.go b/e2e/tests/core/client_test.go index 05f0337f94a..1f9cbb1cf4d 100644 --- a/e2e/tests/core/client_test.go +++ b/e2e/tests/core/client_test.go @@ -8,9 +8,6 @@ import ( "testing" "time" - "github.com/DimitrisJim/ictest/v7/chain/cosmos" - "github.com/DimitrisJim/ictest/v7/ibc" - test "github.com/DimitrisJim/ictest/v7/testutil" "github.com/cometbft/cometbft/crypto/tmhash" tmjson "github.com/cometbft/cometbft/libs/json" "github.com/cometbft/cometbft/privval" @@ -19,6 +16,9 @@ import ( tmtypes "github.com/cometbft/cometbft/types" tmversion "github.com/cometbft/cometbft/version" "github.com/cosmos/cosmos-sdk/client/grpc/tmservice" + "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v7/ibc" + test "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/suite" "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" diff --git a/e2e/tests/interchain_accounts/base_test.go b/e2e/tests/interchain_accounts/base_test.go index 4ca4f6f4ac9..45c7173ef45 100644 --- a/e2e/tests/interchain_accounts/base_test.go +++ b/e2e/tests/interchain_accounts/base_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - interchaintest "github.com/DimitrisJim/ictest/v7" - "github.com/DimitrisJim/ictest/v7/chain/cosmos" - "github.com/DimitrisJim/ictest/v7/ibc" - test "github.com/DimitrisJim/ictest/v7/testutil" + interchaintest "github.com/strangelove-ventures/interchaintest/v7" + "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v7/ibc" + test "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/suite" "golang.org/x/mod/semver" diff --git a/e2e/tests/interchain_accounts/gov_test.go b/e2e/tests/interchain_accounts/gov_test.go index 6906755984b..4b600586d19 100644 --- a/e2e/tests/interchain_accounts/gov_test.go +++ b/e2e/tests/interchain_accounts/gov_test.go @@ -10,9 +10,9 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/cosmos/gogoproto/proto" - interchaintest "github.com/DimitrisJim/ictest/v7" - "github.com/DimitrisJim/ictest/v7/ibc" - test "github.com/DimitrisJim/ictest/v7/testutil" + interchaintest "github.com/strangelove-ventures/interchaintest/v7" + "github.com/strangelove-ventures/interchaintest/v7/ibc" + test "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/suite" "github.com/cosmos/ibc-go/e2e/testsuite" diff --git a/e2e/tests/interchain_accounts/groups_test.go b/e2e/tests/interchain_accounts/groups_test.go index 9377560a04e..ed5c77c2ca6 100644 --- a/e2e/tests/interchain_accounts/groups_test.go +++ b/e2e/tests/interchain_accounts/groups_test.go @@ -5,13 +5,13 @@ import ( "testing" "time" - interchaintest "github.com/DimitrisJim/ictest/v7" - "github.com/DimitrisJim/ictest/v7/ibc" - test "github.com/DimitrisJim/ictest/v7/testutil" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" grouptypes "github.com/cosmos/cosmos-sdk/x/group" "github.com/cosmos/gogoproto/proto" + interchaintest "github.com/strangelove-ventures/interchaintest/v7" + "github.com/strangelove-ventures/interchaintest/v7/ibc" + test "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/suite" "github.com/cosmos/ibc-go/e2e/testsuite" diff --git a/e2e/tests/interchain_accounts/incentivized_test.go b/e2e/tests/interchain_accounts/incentivized_test.go index 6711ce2afc1..cc5918ce86a 100644 --- a/e2e/tests/interchain_accounts/incentivized_test.go +++ b/e2e/tests/interchain_accounts/incentivized_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" - interchaintest "github.com/DimitrisJim/ictest/v7" - "github.com/DimitrisJim/ictest/v7/ibc" - test "github.com/DimitrisJim/ictest/v7/testutil" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/gogoproto/proto" + interchaintest "github.com/strangelove-ventures/interchaintest/v7" + "github.com/strangelove-ventures/interchaintest/v7/ibc" + test "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/suite" "github.com/cosmos/ibc-go/e2e/testconfig" diff --git a/e2e/tests/interchain_accounts/intertx_incentivized_test.go b/e2e/tests/interchain_accounts/intertx_incentivized_test.go index 321ee9c6969..74cda8db887 100644 --- a/e2e/tests/interchain_accounts/intertx_incentivized_test.go +++ b/e2e/tests/interchain_accounts/intertx_incentivized_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - interchaintest "github.com/DimitrisJim/ictest/v7" - "github.com/DimitrisJim/ictest/v7/ibc" - test "github.com/DimitrisJim/ictest/v7/testutil" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" intertxtypes "github.com/cosmos/interchain-accounts/x/inter-tx/types" + interchaintest "github.com/strangelove-ventures/interchaintest/v7" + "github.com/strangelove-ventures/interchaintest/v7/ibc" + test "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/suite" "github.com/cosmos/ibc-go/e2e/testvalues" diff --git a/e2e/tests/interchain_accounts/intertx_test.go b/e2e/tests/interchain_accounts/intertx_test.go index a2cdc3197b3..3e9b85b5978 100644 --- a/e2e/tests/interchain_accounts/intertx_test.go +++ b/e2e/tests/interchain_accounts/intertx_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - interchaintest "github.com/DimitrisJim/ictest/v7" - "github.com/DimitrisJim/ictest/v7/chain/cosmos" - "github.com/DimitrisJim/ictest/v7/ibc" - test "github.com/DimitrisJim/ictest/v7/testutil" + interchaintest "github.com/strangelove-ventures/interchaintest/v7" + "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v7/ibc" + test "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/suite" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/e2e/tests/interchain_accounts/localhost_test.go b/e2e/tests/interchain_accounts/localhost_test.go index 42ec00ba285..c06fbb53640 100644 --- a/e2e/tests/interchain_accounts/localhost_test.go +++ b/e2e/tests/interchain_accounts/localhost_test.go @@ -17,11 +17,11 @@ import ( ibctesting "github.com/cosmos/ibc-go/v7/testing" "github.com/stretchr/testify/suite" - interchaintest "github.com/DimitrisJim/ictest/v7" - "github.com/DimitrisJim/ictest/v7/ibc" - test "github.com/DimitrisJim/ictest/v7/testutil" "github.com/cosmos/ibc-go/e2e/testsuite" "github.com/cosmos/ibc-go/e2e/testvalues" + interchaintest "github.com/strangelove-ventures/interchaintest/v7" + "github.com/strangelove-ventures/interchaintest/v7/ibc" + test "github.com/strangelove-ventures/interchaintest/v7/testutil" ) func TestInterchainAccountsLocalhostTestSuite(t *testing.T) { diff --git a/e2e/tests/transfer/authz_test.go b/e2e/tests/transfer/authz_test.go index 31290c99ecb..2906122d0d0 100644 --- a/e2e/tests/transfer/authz_test.go +++ b/e2e/tests/transfer/authz_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - test "github.com/DimitrisJim/ictest/v7/testutil" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/authz" + test "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/suite" "github.com/cosmos/ibc-go/e2e/testsuite" diff --git a/e2e/tests/transfer/base_test.go b/e2e/tests/transfer/base_test.go index f5d5d049cfe..bb52044b561 100644 --- a/e2e/tests/transfer/base_test.go +++ b/e2e/tests/transfer/base_test.go @@ -6,13 +6,10 @@ import ( "testing" "time" -<<<<<<< HEAD // "cosmossdk.io/math" -======= - "github.com/DimitrisJim/ictest/v7/ibc" - test "github.com/DimitrisJim/ictest/v7/testutil" ->>>>>>> f44dd9ae (Point interchaintest to fork.) paramsproposaltypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal" + "github.com/strangelove-ventures/interchaintest/v7/ibc" + test "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/suite" "github.com/cosmos/ibc-go/e2e/semverutil" diff --git a/e2e/tests/transfer/incentivized_test.go b/e2e/tests/transfer/incentivized_test.go index 3b2f4bdd1f4..e3c3296c0ae 100644 --- a/e2e/tests/transfer/incentivized_test.go +++ b/e2e/tests/transfer/incentivized_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/DimitrisJim/ictest/v7/ibc" - test "github.com/DimitrisJim/ictest/v7/testutil" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/strangelove-ventures/interchaintest/v7/ibc" + test "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/suite" "github.com/cosmos/ibc-go/e2e/testvalues" diff --git a/e2e/tests/transfer/localhost_test.go b/e2e/tests/transfer/localhost_test.go index 8b4de25a305..af42a1c3488 100644 --- a/e2e/tests/transfer/localhost_test.go +++ b/e2e/tests/transfer/localhost_test.go @@ -6,13 +6,13 @@ import ( "github.com/stretchr/testify/suite" - test "github.com/DimitrisJim/ictest/v7/testutil" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" localhost "github.com/cosmos/ibc-go/v7/modules/light-clients/09-localhost" ibctesting "github.com/cosmos/ibc-go/v7/testing" + test "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/cosmos/ibc-go/e2e/testsuite" "github.com/cosmos/ibc-go/e2e/testvalues" diff --git a/e2e/tests/upgrades/upgrade_test.go b/e2e/tests/upgrades/upgrade_test.go index 52ea6993545..b51adb601a7 100644 --- a/e2e/tests/upgrades/upgrade_test.go +++ b/e2e/tests/upgrades/upgrade_test.go @@ -6,19 +6,16 @@ import ( "testing" "time" -<<<<<<< HEAD "cosmossdk.io/math" -======= - interchaintest "github.com/DimitrisJim/ictest/v7" - "github.com/DimitrisJim/ictest/v7/chain/cosmos" - "github.com/DimitrisJim/ictest/v7/ibc" - test "github.com/DimitrisJim/ictest/v7/testutil" ->>>>>>> f44dd9ae (Point interchaintest to fork.) sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/cosmos/gogoproto/proto" intertxtypes "github.com/cosmos/interchain-accounts/x/inter-tx/types" + interchaintest "github.com/strangelove-ventures/interchaintest/v7" + "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v7/ibc" + test "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/suite" "golang.org/x/mod/semver" diff --git a/e2e/testsuite/diagnostics/diagnostics.go b/e2e/testsuite/diagnostics/diagnostics.go index 1614364e882..72ae0960250 100644 --- a/e2e/testsuite/diagnostics/diagnostics.go +++ b/e2e/testsuite/diagnostics/diagnostics.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "github.com/DimitrisJim/ictest/v7/ibc" dockertypes "github.com/docker/docker/api/types" dockerclient "github.com/docker/docker/client" + "github.com/strangelove-ventures/interchaintest/v7/ibc" "github.com/cosmos/ibc-go/e2e/dockerutil" "github.com/cosmos/ibc-go/e2e/testconfig" diff --git a/e2e/testsuite/testsuite.go b/e2e/testsuite/testsuite.go index 9e6b0ac748b..f905a2225b2 100644 --- a/e2e/testsuite/testsuite.go +++ b/e2e/testsuite/testsuite.go @@ -142,7 +142,7 @@ func (s *E2ETestSuite) SetupChainsRelayerAndChannel(ctx context.Context, channel // SetupSingleChain creates and returns a single CosmosChain for usage in e2e tests. // This is useful for testing single chain functionality when performing coordinated upgrades as well as testing localhost ibc client functionality. // TODO: Actually setup a single chain. Seeing panic: runtime error: index out of range [0] with length 0 when using a single chain. -// issue: https://github.com/DimitrisJim/ictest/issues/401 +// issue: https://github.com/strangelove-ventures/interchaintest/issues/401 func (s *E2ETestSuite) SetupSingleChain(ctx context.Context) *cosmos.CosmosChain { chainA, chainB := s.GetChains()