updating interchaintest

archway-network · May 22, 2024 · 147d394 · 147d394
1 parent 01051a2
commit 147d394
Show file tree

Hide file tree

Showing 8 changed files with 451 additions and 341 deletions.
diff --git a/interchaintest/chain_upgrade_test.go b/interchaintest/chain_upgrade_test.go
@@ -5,16 +5,15 @@ import (
 	"testing"
 	"time"
 
+	upgradetypes "cosmossdk.io/x/upgrade/types"
 	cosmosproto "github.com/cosmos/gogoproto/proto"
 	"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/testutil"
+	interchaintest "github.com/strangelove-ventures/interchaintest/v8"
+	"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"
+	"github.com/strangelove-ventures/interchaintest/v8/ibc"
+	"github.com/strangelove-ventures/interchaintest/v8/testutil"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
-
-	upgradetypes "cosmossdk.io/x/upgrade/types"
 )
 
 const (
@@ -88,6 +87,8 @@ func submitUpgradeProposalAndVote(t *testing.T, ctx context.Context, nextUpgrade
 		"Every PR we preform an upgrade check to ensure nothing breaks",
 		"metadata",
 		"10000000000"+archwayChain.Config().Denom,
+		chainUser.KeyName(),
+		false,
 	)
 	require.NoError(t, err, "error building proposal tx")
 

diff --git a/interchaintest/chain_v402_upgrade_test.go b/interchaintest/chain_v402_upgrade_test.go
@@ -8,8 +8,8 @@ import (
 	"gopkg.in/yaml.v2"
 
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
-	"github.com/strangelove-ventures/interchaintest/v7/testutil"
+	"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"
+	"github.com/strangelove-ventures/interchaintest/v8/testutil"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/interchaintest/cwica_test.go b/interchaintest/cwica_test.go
@@ -6,12 +6,12 @@ import (
 
 	cosmosproto "github.com/cosmos/gogoproto/proto"
 	channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
-	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/relayer"
-	"github.com/strangelove-ventures/interchaintest/v7/testreporter"
-	"github.com/strangelove-ventures/interchaintest/v7/testutil"
+	interchaintest "github.com/strangelove-ventures/interchaintest/v8"
+	"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"
+	"github.com/strangelove-ventures/interchaintest/v8/ibc"
+	"github.com/strangelove-ventures/interchaintest/v8/relayer"
+	"github.com/strangelove-ventures/interchaintest/v8/testreporter"
+	"github.com/strangelove-ventures/interchaintest/v8/testutil"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 )
@@ -190,7 +190,15 @@ func TestCWICA(t *testing.T) {
 	require.Contains(t, contractRes.Data.Errors, "error handling packet")
 
 	// Create a gov prop on the counterparty chain
-	propMsg, err := counterpartyChain.BuildProposal([]cosmosproto.Message{}, "TextProp", "Summary", "Metadata", "10000000000"+counterpartyChain.Config().Denom)
+	propMsg, err := counterpartyChain.BuildProposal(
+		[]cosmosproto.Message{},
+		"TextProp",
+		"Summary",
+		"Metadata",
+		"10000000000"+counterpartyChain.Config().Denom,
+		counterpartyChainUser.KeyName(),
+		false,
+	)
 	require.NoError(t, err)
 	textProp, err := counterpartyChain.SubmitProposal(ctx, counterpartyChainUser.KeyName(), propMsg)
 	require.NoError(t, err)

diff --git a/interchaintest/go.mod b/interchaintest/go.mod
diff --git a/interchaintest/go.sum b/interchaintest/go.sum
diff --git a/interchaintest/ibc_conformance_test.go b/interchaintest/ibc_conformance_test.go
@@ -4,12 +4,12 @@ import (
 	"context"
 	"testing"
 
-	interchaintest "github.com/strangelove-ventures/interchaintest/v7"
-	"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
-	"github.com/strangelove-ventures/interchaintest/v7/conformance"
-	"github.com/strangelove-ventures/interchaintest/v7/ibc"
-	"github.com/strangelove-ventures/interchaintest/v7/relayer"
-	"github.com/strangelove-ventures/interchaintest/v7/testreporter"
+	interchaintest "github.com/strangelove-ventures/interchaintest/v8"
+	"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"
+	"github.com/strangelove-ventures/interchaintest/v8/conformance"
+	"github.com/strangelove-ventures/interchaintest/v8/ibc"
+	"github.com/strangelove-ventures/interchaintest/v8/relayer"
+	"github.com/strangelove-ventures/interchaintest/v8/testreporter"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 )

diff --git a/interchaintest/setup.go b/interchaintest/setup.go
@@ -3,10 +3,11 @@ package interchaintest
 import (
 	"fmt"
 
+	"cosmossdk.io/math"
 	"github.com/cosmos/cosmos-sdk/types"
-	interchaintest "github.com/strangelove-ventures/interchaintest/v7"
-	"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
-	"github.com/strangelove-ventures/interchaintest/v7/ibc"
+	interchaintest "github.com/strangelove-ventures/interchaintest/v8"
+	"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"
+	"github.com/strangelove-ventures/interchaintest/v8/ibc"
 )
 
 const (
@@ -58,11 +59,11 @@ func getDefaultChainConfig() ibc.ChainConfig {
 		PreGenesis:     nil,
 		ModifyGenesisAmounts: func() (types.Coin, types.Coin) {
 			genesisAmount := types.Coin{
-				Amount: types.NewInt(9_000_000_000_000_000_000),
+				Amount: math.NewInt(9_000_000_000_000_000_000),
 				Denom:  denom,
 			}
 			genesisSelfDelegation := types.Coin{
-				Amount: types.NewInt(5_000_000_000_000_000_000),
+				Amount: math.NewInt(5_000_000_000_000_000_000),
 				Denom:  denom,
 			}
 			return genesisAmount, genesisSelfDelegation

diff --git a/interchaintest/utils.go b/interchaintest/utils.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
-	"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
-	"github.com/strangelove-ventures/interchaintest/v7/ibc"
-	"github.com/strangelove-ventures/interchaintest/v7/testutil"
+	"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"
+	"github.com/strangelove-ventures/interchaintest/v8/ibc"
+	"github.com/strangelove-ventures/interchaintest/v8/testutil"
 	"gopkg.in/yaml.v2"
 )