Skip to content

Commit

Permalink
fix e2e go mod
Browse files Browse the repository at this point in the history
  • Loading branch information
@tac0turtle
tac0turtle committed Nov 6, 2024
1 parent 6ef7fc1 commit ac74c7d
Show file tree
Hide file tree
Showing 33 changed files with 1,051 additions and 1,246 deletions.
171 changes: 86 additions & 85 deletions e2e/go.mod
View file

Large diffs are not rendered by default.

668 changes: 231 additions & 437 deletions e2e/go.sum
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions e2e/relayer/relayer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (

dockerclient "github.com/docker/docker/client"
"github.com/pelletier/go-toml"
"github.com/strangelove-ventures/interchaintest/v8"
"github.com/strangelove-ventures/interchaintest/v8/ibc"
"github.com/strangelove-ventures/interchaintest/v8/relayer"
"github.com/strangelove-ventures/interchaintest/v8/relayer/hermes"
"github.com/strangelove-ventures/interchaintest/v9"
"github.com/strangelove-ventures/interchaintest/v9/ibc"
"github.com/strangelove-ventures/interchaintest/v9/relayer"
"github.com/strangelove-ventures/interchaintest/v9/relayer/hermes"
"go.uber.org/zap"
)

Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/core/02-client/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"testing"
"time"

"github.com/strangelove-ventures/interchaintest/v8/ibc"
test "github.com/strangelove-ventures/interchaintest/v8/testutil"
"github.com/strangelove-ventures/interchaintest/v9/ibc"
test "github.com/strangelove-ventures/interchaintest/v9/testutil"
testifysuite "github.com/stretchr/testify/suite"

upgradetypes "cosmossdk.io/x/upgrade/types"
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 @@ -10,8 +10,8 @@ import (
"testing"
"time"

"github.com/strangelove-ventures/interchaintest/v8/ibc"
test "github.com/strangelove-ventures/interchaintest/v8/testutil"
"github.com/strangelove-ventures/interchaintest/v9/ibc"
test "github.com/strangelove-ventures/interchaintest/v9/testutil"
testifysuite "github.com/stretchr/testify/suite"

govtypes "cosmossdk.io/x/gov/types"
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 @@ -8,9 +8,9 @@ import (
"time"

"github.com/cosmos/gogoproto/proto"
"github.com/strangelove-ventures/interchaintest/v8"
"github.com/strangelove-ventures/interchaintest/v8/ibc"
test "github.com/strangelove-ventures/interchaintest/v8/testutil"
"github.com/strangelove-ventures/interchaintest/v9"
"github.com/strangelove-ventures/interchaintest/v9/ibc"
test "github.com/strangelove-ventures/interchaintest/v9/testutil"
testifysuite "github.com/stretchr/testify/suite"

sdkmath "cosmossdk.io/math"
Expand Down Expand Up @@ -502,7 +502,7 @@ func (s *InterchainAccountsTestSuite) testMsgSendTxSuccessfulGovProposal(order c
msg, err := govv1.NewMsgSubmitProposal(
[]sdk.Msg{testProposal},
sdk.NewCoins(sdk.NewCoin(chainB.Config().Denom, sdkmath.NewInt(10_000_000))),
hostAccount, "e2e", "e2e", "e2e", false,
hostAccount, "e2e", "e2e", "e2e", 1,
)
s.Require().NoError(err)

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 @@ -8,9 +8,9 @@ import (
"time"

"github.com/cosmos/gogoproto/proto"
"github.com/strangelove-ventures/interchaintest/v8"
"github.com/strangelove-ventures/interchaintest/v8/ibc"
test "github.com/strangelove-ventures/interchaintest/v8/testutil"
"github.com/strangelove-ventures/interchaintest/v9"
"github.com/strangelove-ventures/interchaintest/v9/ibc"
test "github.com/strangelove-ventures/interchaintest/v9/testutil"
testifysuite "github.com/stretchr/testify/suite"

sdkmath "cosmossdk.io/math"
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 @@ -8,9 +8,9 @@ import (
"time"

"github.com/cosmos/gogoproto/proto"
interchaintest "github.com/strangelove-ventures/interchaintest/v8"
"github.com/strangelove-ventures/interchaintest/v8/ibc"
test "github.com/strangelove-ventures/interchaintest/v8/testutil"
interchaintest "github.com/strangelove-ventures/interchaintest/v9"
"github.com/strangelove-ventures/interchaintest/v9/ibc"
test "github.com/strangelove-ventures/interchaintest/v9/testutil"
testifysuite "github.com/stretchr/testify/suite"

sdkmath "cosmossdk.io/math"
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 @@ -8,9 +8,9 @@ import (
"time"

"github.com/cosmos/gogoproto/proto"
interchaintest "github.com/strangelove-ventures/interchaintest/v8"
"github.com/strangelove-ventures/interchaintest/v8/ibc"
test "github.com/strangelove-ventures/interchaintest/v8/testutil"
interchaintest "github.com/strangelove-ventures/interchaintest/v9"
"github.com/strangelove-ventures/interchaintest/v9/ibc"
test "github.com/strangelove-ventures/interchaintest/v9/testutil"
testifysuite "github.com/stretchr/testify/suite"

sdkmath "cosmossdk.io/math"
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 @@ -8,9 +8,9 @@ import (
"time"

"github.com/cosmos/gogoproto/proto"
"github.com/strangelove-ventures/interchaintest/v8"
"github.com/strangelove-ventures/interchaintest/v8/ibc"
test "github.com/strangelove-ventures/interchaintest/v8/testutil"
"github.com/strangelove-ventures/interchaintest/v9"
"github.com/strangelove-ventures/interchaintest/v9/ibc"
test "github.com/strangelove-ventures/interchaintest/v9/testutil"
testifysuite "github.com/stretchr/testify/suite"

sdkmath "cosmossdk.io/math"
Expand Down
6 changes: 3 additions & 3 deletions e2e/tests/interchain_accounts/params_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"time"

"github.com/cosmos/gogoproto/proto"
"github.com/strangelove-ventures/interchaintest/v8"
"github.com/strangelove-ventures/interchaintest/v8/ibc"
test "github.com/strangelove-ventures/interchaintest/v8/testutil"
"github.com/strangelove-ventures/interchaintest/v9"
"github.com/strangelove-ventures/interchaintest/v9/ibc"
test "github.com/strangelove-ventures/interchaintest/v9/testutil"
testifysuite "github.com/stretchr/testify/suite"

sdkmath "cosmossdk.io/math"
Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/interchain_accounts/query_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"time"

"github.com/cosmos/gogoproto/proto"
"github.com/strangelove-ventures/interchaintest/v8/testutil"
"github.com/strangelove-ventures/interchaintest/v9/testutil"
testifysuite "github.com/stretchr/testify/suite"

banktypes "cosmossdk.io/x/bank/types"
Expand Down Expand Up @@ -78,7 +78,7 @@ func (s *InterchainAccountsQueryTestSuite) TestInterchainAccountsQuery() {
t.Run("query via interchain account", func(t *testing.T) {
// the host account need not be funded
t.Run("broadcast query packet", func(t *testing.T) {
balanceQuery := banktypes.NewQueryBalanceRequest(chainBAccount.Address(), chainB.Config().Denom)
balanceQuery := banktypes.NewQueryBalanceRequest(string(chainBAccount.Address()), chainB.Config().Denom) //TODO: address should be a bech32 address?
queryBz, err := balanceQuery.Marshal()
s.Require().NoError(err)

Expand Down
6 changes: 3 additions & 3 deletions e2e/tests/interchain_accounts/upgrades_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"time"

"github.com/cosmos/gogoproto/proto"
"github.com/strangelove-ventures/interchaintest/v8"
"github.com/strangelove-ventures/interchaintest/v8/ibc"
test "github.com/strangelove-ventures/interchaintest/v8/testutil"
"github.com/strangelove-ventures/interchaintest/v9"
"github.com/strangelove-ventures/interchaintest/v9/ibc"
test "github.com/strangelove-ventures/interchaintest/v9/testutil"
testifysuite "github.com/stretchr/testify/suite"

sdkmath "cosmossdk.io/math"
Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/transfer/authz_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"context"
"testing"

"github.com/strangelove-ventures/interchaintest/v8/ibc"
test "github.com/strangelove-ventures/interchaintest/v8/testutil"
"github.com/strangelove-ventures/interchaintest/v9/ibc"
test "github.com/strangelove-ventures/interchaintest/v9/testutil"
testifysuite "github.com/stretchr/testify/suite"

sdkmath "cosmossdk.io/math"
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 @@ -7,8 +7,8 @@ import (
"testing"
"time"

"github.com/strangelove-ventures/interchaintest/v8/ibc"
test "github.com/strangelove-ventures/interchaintest/v8/testutil"
"github.com/strangelove-ventures/interchaintest/v9/ibc"
test "github.com/strangelove-ventures/interchaintest/v9/testutil"
testifysuite "github.com/stretchr/testify/suite"

sdkmath "cosmossdk.io/math"
Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/transfer/forwarding_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"
"time"

"github.com/strangelove-ventures/interchaintest/v8/ibc"
test "github.com/strangelove-ventures/interchaintest/v8/testutil"
"github.com/strangelove-ventures/interchaintest/v9/ibc"
test "github.com/strangelove-ventures/interchaintest/v9/testutil"
testifysuite "github.com/stretchr/testify/suite"

"github.com/cosmos/ibc-go/e2e/testsuite"
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 @@ -8,8 +8,8 @@ import (
"testing"
"time"

"github.com/strangelove-ventures/interchaintest/v8/ibc"
test "github.com/strangelove-ventures/interchaintest/v8/testutil"
"github.com/strangelove-ventures/interchaintest/v9/ibc"
test "github.com/strangelove-ventures/interchaintest/v9/testutil"
testifysuite "github.com/stretchr/testify/suite"

sdkmath "cosmossdk.io/math"
Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/transfer/localhost_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"context"
"testing"

"github.com/strangelove-ventures/interchaintest/v8/ibc"
test "github.com/strangelove-ventures/interchaintest/v8/testutil"
"github.com/strangelove-ventures/interchaintest/v9/ibc"
test "github.com/strangelove-ventures/interchaintest/v9/testutil"
testifysuite "github.com/stretchr/testify/suite"

"github.com/cosmos/ibc-go/e2e/testsuite"
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/transfer/send_enabled_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"context"
"testing"

test "github.com/strangelove-ventures/interchaintest/v8/testutil"
test "github.com/strangelove-ventures/interchaintest/v9/testutil"
testifysuite "github.com/stretchr/testify/suite"

govtypes "cosmossdk.io/x/gov/types"
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/transfer/send_receive_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"context"
"testing"

test "github.com/strangelove-ventures/interchaintest/v8/testutil"
test "github.com/strangelove-ventures/interchaintest/v9/testutil"
testifysuite "github.com/stretchr/testify/suite"

govtypes "cosmossdk.io/x/gov/types"
Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/transfer/upgradesv1_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"context"
"testing"

"github.com/strangelove-ventures/interchaintest/v8/ibc"
test "github.com/strangelove-ventures/interchaintest/v8/testutil"
"github.com/strangelove-ventures/interchaintest/v9/ibc"
test "github.com/strangelove-ventures/interchaintest/v9/testutil"
testifysuite "github.com/stretchr/testify/suite"

sdkmath "cosmossdk.io/math"
Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/transfer/upgradesv2_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"sync"
"testing"

"github.com/strangelove-ventures/interchaintest/v8/ibc"
test "github.com/strangelove-ventures/interchaintest/v8/testutil"
"github.com/strangelove-ventures/interchaintest/v9/ibc"
test "github.com/strangelove-ventures/interchaintest/v9/testutil"
testifysuite "github.com/stretchr/testify/suite"

sdkmath "cosmossdk.io/math"
Expand Down
8 changes: 4 additions & 4 deletions e2e/tests/upgrades/genesis_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"time"

"github.com/cosmos/gogoproto/proto"
"github.com/strangelove-ventures/interchaintest/v8"
"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v8/ibc"
test "github.com/strangelove-ventures/interchaintest/v8/testutil"
"github.com/strangelove-ventures/interchaintest/v9"
"github.com/strangelove-ventures/interchaintest/v9/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v9/ibc"
test "github.com/strangelove-ventures/interchaintest/v9/testutil"
"github.com/stretchr/testify/suite"
"go.uber.org/zap"

Expand Down
14 changes: 9 additions & 5 deletions e2e/tests/upgrades/upgrade_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"time"

"github.com/cosmos/gogoproto/proto"
interchaintest "github.com/strangelove-ventures/interchaintest/v8"
"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v8/ibc"
test "github.com/strangelove-ventures/interchaintest/v8/testutil"
interchaintest "github.com/strangelove-ventures/interchaintest/v9"
"github.com/strangelove-ventures/interchaintest/v9/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v9/ibc"
test "github.com/strangelove-ventures/interchaintest/v9/testutil"
testifysuite "github.com/stretchr/testify/suite"

sdkmath "cosmossdk.io/math"
Expand Down Expand Up @@ -82,7 +82,11 @@ func (s *UpgradeTestSuite) UpgradeChain(ctx context.Context, chain *cosmos.Cosmo

s.ExecuteAndPassGovV1Proposal(ctx, msgSoftwareUpgrade, chain, wallet)
} else {
upgradeProposal := upgradetypes.NewSoftwareUpgradeProposal(fmt.Sprintf("upgrade from %s to %s", currentVersion, upgradeVersion), "upgrade chain E2E test", plan)
upgradeProposal := upgradetypes.SoftwareUpgradeProposal{
Title: fmt.Sprintf("upgrade from %s to %s", currentVersion, upgradeVersion),
Description: "upgrade chain E2E test",
Plan: plan,
}
s.ExecuteAndPassGovV1Beta1Proposal(ctx, chain, wallet, upgradeProposal)
}

Expand Down
Loading

0 comments on commit ac74c7d

Please sign in to comment.