Skip to content

Commit

Permalink
Point interchaintest to fork.
Browse files Browse the repository at this point in the history
  • Loading branch information
@DimitrisJim
DimitrisJim committed Apr 5, 2023
1 parent 29a5279 commit f44dd9a
Show file tree
Hide file tree
Showing 23 changed files with 59 additions and 55 deletions.
2 changes: 1 addition & 1 deletion e2e/dockerutil/dockerutil.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/strangelove-ventures/interchaintest/blob/0bdc194c2aa11aa32479f32b19e1c50304301981/internal/dockerutil/setup.go#L31-L36
// see: https://github.com/DimitrisJim/ictest/blob/0bdc194c2aa11aa32479f32b19e1c50304301981/internal/dockerutil/setup.go#L31-L36
// for the label needed to identify test containers.
filters.Arg("label", testLabel+"="+t.Name()),
),
Expand Down
2 changes: 1 addition & 1 deletion e2e/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ require (
github.com/cosmos/ibc-go/v7 v7.0.0
github.com/cosmos/interchain-accounts v0.5.1
github.com/docker/docker v20.10.19+incompatible
github.com/strangelove-ventures/interchaintest/v7 v7.0.0-20230322043324-cb6ba0947fff
github.com/stretchr/testify v1.8.2
go.uber.org/zap v1.24.0
golang.org/x/mod v0.9.0
Expand All @@ -35,6 +34,7 @@ require (
github.com/BurntSushi/toml v1.2.1 // indirect
github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect
github.com/ChainSafe/go-schnorrkel/1 v0.0.0-00010101000000-000000000000 // indirect
github.com/DimitrisJim/ictest/v7 v7.0.0-20230405142614-dbc9eb41c342 // indirect
github.com/Microsoft/go-winio v0.6.0 // indirect
github.com/StirlingMarketingGroup/go-namecase v1.0.0 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
Expand Down
4 changes: 4 additions & 0 deletions e2e/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,10 @@ github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:
github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM=
github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4=
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
github.com/DimitrisJim/ictest/v7 v7.0.0-20230405125033-ee0c6eaf605b h1:PsOQVCHmcOwF/zvKlr1bd8Cvpx8JWOh6YL62lDlowt0=
github.com/DimitrisJim/ictest/v7 v7.0.0-20230405125033-ee0c6eaf605b/go.mod h1:zlKqLfeJ2tth4jGTok+witx87Ndap7twUPQoGWxRHqk=
github.com/DimitrisJim/ictest/v7 v7.0.0-20230405142614-dbc9eb41c342 h1:B0c7ZHgY10+YLvkbNbOgQkng3KGb8Ezu4sHQeUUjPlw=
github.com/DimitrisJim/ictest/v7 v7.0.0-20230405142614-dbc9eb41c342/go.mod h1:zlKqLfeJ2tth4jGTok+witx87Ndap7twUPQoGWxRHqk=
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg=
github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE=
Expand Down
6 changes: 3 additions & 3 deletions e2e/relayer/relayer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"github.com/strangelove-ventures/interchaintest/v7"
"github.com/strangelove-ventures/interchaintest/v7/ibc"
"github.com/strangelove-ventures/interchaintest/v7/relayer"
"go.uber.org/zap"
)

Expand Down
4 changes: 2 additions & 2 deletions e2e/testconfig/testconfig.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ 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"
Expand All @@ -16,8 +18,6 @@ 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"
Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/core/03-connection/connection_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions e2e/tests/core/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ 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"
Expand All @@ -16,9 +19,6 @@ 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"
Expand Down
8 changes: 4 additions & 4 deletions e2e/tests/interchain_accounts/base_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"testing"
"time"

"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"
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"
"github.com/stretchr/testify/suite"
"golang.org/x/mod/semver"

Expand Down
6 changes: 3 additions & 3 deletions e2e/tests/interchain_accounts/gov_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
"github.com/cosmos/gogoproto/proto"

"github.com/strangelove-ventures/interchaintest/v7"
"github.com/strangelove-ventures/interchaintest/v7/ibc"
test "github.com/strangelove-ventures/interchaintest/v7/testutil"
interchaintest "github.com/DimitrisJim/ictest/v7"
"github.com/DimitrisJim/ictest/v7/ibc"
test "github.com/DimitrisJim/ictest/v7/testutil"
"github.com/stretchr/testify/suite"

"github.com/cosmos/ibc-go/e2e/testsuite"
Expand Down
6 changes: 3 additions & 3 deletions e2e/tests/interchain_accounts/groups_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions e2e/tests/interchain_accounts/incentivized_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions e2e/tests/interchain_accounts/intertx_incentivized_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"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"
Expand Down
8 changes: 4 additions & 4 deletions e2e/tests/interchain_accounts/intertx_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"context"
"testing"

"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"
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"
"github.com/stretchr/testify/suite"

sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down
6 changes: 3 additions & 3 deletions e2e/tests/interchain_accounts/localhost_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"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) {
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/transfer/authz_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/transfer/base_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,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/semverutil"
Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/transfer/incentivized_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/transfer/localhost_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions e2e/tests/upgrades/upgrade_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ 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"
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"

Expand Down
2 changes: 1 addition & 1 deletion e2e/testsuite/diagnostics/diagnostics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions e2e/testsuite/grpc_query.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import (
"context"
"sort"

"github.com/DimitrisJim/ictest/v7/chain/cosmos"
"github.com/DimitrisJim/ictest/v7/ibc"
tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
govtypesbeta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
intertxtypes "github.com/cosmos/interchain-accounts/x/inter-tx/types"
"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v7/ibc"

controllertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types"
feetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types"
Expand Down
12 changes: 6 additions & 6 deletions e2e/testsuite/testsuite.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ import (
"strings"
"time"

interchaintest "github.com/DimitrisJim/ictest/v7"
"github.com/DimitrisJim/ictest/v7/chain/cosmos"
"github.com/DimitrisJim/ictest/v7/ibc"
"github.com/DimitrisJim/ictest/v7/testreporter"
test "github.com/DimitrisJim/ictest/v7/testutil"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
"github.com/cosmos/cosmos-sdk/client/tx"
Expand All @@ -21,11 +26,6 @@ import (
paramsproposaltypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
intertxtypes "github.com/cosmos/interchain-accounts/x/inter-tx/types"
dockerclient "github.com/docker/docker/client"
interchaintest "github.com/strangelove-ventures/interchaintest/v7"
"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v7/ibc"
"github.com/strangelove-ventures/interchaintest/v7/testreporter"
test "github.com/strangelove-ventures/interchaintest/v7/testutil"
"github.com/stretchr/testify/suite"
"go.uber.org/zap"
"go.uber.org/zap/zaptest"
Expand Down Expand Up @@ -180,7 +180,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/strangelove-ventures/interchaintest/issues/401
// issue: https://github.com/DimitrisJim/ictest/issues/401
func (s *E2ETestSuite) SetupSingleChain(ctx context.Context) *cosmos.CosmosChain {
chainA, chainB := s.GetChains()

Expand Down
2 changes: 1 addition & 1 deletion e2e/testvalues/values.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"time"

"github.com/DimitrisJim/ictest/v7/ibc"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/strangelove-ventures/interchaintest/v7/ibc"

feetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types"
)
Expand Down

0 comments on commit f44dd9a

Please sign in to comment.