From fce2e95bb10d3e89e61b0d3c2c69dde72b475035 Mon Sep 17 00:00:00 2001 From: crodriguezvega Date: Tue, 4 Oct 2022 22:47:47 +0200 Subject: [PATCH] bump icad tag with ibc-go v5.0.0 + gofumpt --- .github/workflows/e2e-manual-icad.yaml | 4 ++-- .../test-matricies/icad/test-matrix.json | 20 +++++++++---------- .../test-matricies/main/test-matrix.json | 20 +++++++++---------- e2e/tests/interchain_accounts/base_test.go | 4 ++-- .../interchain_accounts/incentivized_test.go | 1 - e2e/testsuite/testsuite.go | 3 ++- modules/core/04-channel/keeper/keeper_test.go | 1 - 7 files changed, 26 insertions(+), 27 deletions(-) diff --git a/.github/workflows/e2e-manual-icad.yaml b/.github/workflows/e2e-manual-icad.yaml index 19d10c9c431..7f6dcb79cbe 100644 --- a/.github/workflows/e2e-manual-icad.yaml +++ b/.github/workflows/e2e-manual-icad.yaml @@ -24,7 +24,7 @@ on: default: master options: - master - - v0.3.3 + - v0.3.4 - v0.2.3 - v0.1.4 chain-b-tag: @@ -34,7 +34,7 @@ on: type: choice options: - master - - v0.3.3 + - v0.3.4 - v0.2.3 - v0.1.4 relayer-tag: diff --git a/e2e/scripts/test-matricies/icad/test-matrix.json b/e2e/scripts/test-matricies/icad/test-matrix.json index 9df5b2524ba..65d758a485b 100644 --- a/e2e/scripts/test-matricies/icad/test-matrix.json +++ b/e2e/scripts/test-matricies/icad/test-matrix.json @@ -4,24 +4,24 @@ "chain-binary": "icad", "tests": [ { - "chain-a-tag": "v0.3.3", + "chain-a-tag": "v0.3.4", "chain-b-tag": "v0.1.4" }, { "chain-a-tag": "v0.1.4", - "chain-b-tag": "v0.3.3" + "chain-b-tag": "v0.3.4" }, { "chain-a-tag": "v0.2.3", - "chain-b-tag": "v0.3.3" + "chain-b-tag": "v0.3.4" }, { - "chain-a-tag": "v0.3.3", + "chain-a-tag": "v0.3.4", "chain-b-tag": "v0.2.3" }, { - "chain-a-tag": "v0.3.3", - "chain-b-tag": "v0.3.3" + "chain-a-tag": "v0.3.4", + "chain-b-tag": "v0.3.4" }, { "chain-a-tag": "v0.2.3", @@ -39,15 +39,15 @@ "tests": [ { "chain-a-tag": "v0.2.3", - "chain-b-tag": "v0.3.3" + "chain-b-tag": "v0.3.4" }, { - "chain-a-tag": "v0.3.3", + "chain-a-tag": "v0.3.4", "chain-b-tag": "v0.2.3" }, { - "chain-a-tag": "v0.3.3", - "chain-b-tag": "v0.3.3" + "chain-a-tag": "v0.3.4", + "chain-b-tag": "v0.3.4" }, { "chain-a-tag": "v0.2.3", diff --git a/e2e/scripts/test-matricies/main/test-matrix.json b/e2e/scripts/test-matricies/main/test-matrix.json index c4823a8e010..c1c8bb441dd 100644 --- a/e2e/scripts/test-matricies/main/test-matrix.json +++ b/e2e/scripts/test-matricies/main/test-matrix.json @@ -120,24 +120,24 @@ "chain-binary": "icad", "tests": [ { - "chain-a-tag": "v0.3.3", + "chain-a-tag": "v0.3.4", "chain-b-tag": "v0.1.4" }, { "chain-a-tag": "v0.1.4", - "chain-b-tag": "v0.3.3" + "chain-b-tag": "v0.3.4" }, { "chain-a-tag": "v0.2.3", - "chain-b-tag": "v0.3.3" + "chain-b-tag": "v0.3.4" }, { - "chain-a-tag": "v0.3.3", + "chain-a-tag": "v0.3.4", "chain-b-tag": "v0.2.3" }, { - "chain-a-tag": "v0.3.3", - "chain-b-tag": "v0.3.3" + "chain-a-tag": "v0.3.4", + "chain-b-tag": "v0.3.4" }, { "chain-a-tag": "v0.2.3", @@ -155,15 +155,15 @@ "tests": [ { "chain-a-tag": "v0.2.3", - "chain-b-tag": "v0.3.3" + "chain-b-tag": "v0.3.4" }, { - "chain-a-tag": "v0.3.3", + "chain-a-tag": "v0.3.4", "chain-b-tag": "v0.2.3" }, { - "chain-a-tag": "v0.3.3", - "chain-b-tag": "v0.3.3" + "chain-a-tag": "v0.3.4", + "chain-b-tag": "v0.3.4" }, { "chain-a-tag": "v0.2.3", diff --git a/e2e/tests/interchain_accounts/base_test.go b/e2e/tests/interchain_accounts/base_test.go index 4388d527c09..def7b1bccdb 100644 --- a/e2e/tests/interchain_accounts/base_test.go +++ b/e2e/tests/interchain_accounts/base_test.go @@ -42,7 +42,8 @@ func (s *InterchainAccountsTestSuite) RegisterInterchainAccount(ctx context.Cont // RegisterCounterPartyPayee broadcasts a MsgRegisterCounterpartyPayee message. func (s *InterchainAccountsTestSuite) RegisterCounterPartyPayee(ctx context.Context, chain *cosmos.CosmosChain, - user *ibc.Wallet, portID, channelID, relayerAddr, counterpartyPayeeAddr string) (sdk.TxResponse, error) { + user *ibc.Wallet, portID, channelID, relayerAddr, counterpartyPayeeAddr string, +) (sdk.TxResponse, error) { msg := feetypes.NewMsgRegisterCounterpartyPayee(portID, channelID, relayerAddr, counterpartyPayeeAddr) return s.BroadcastMessages(ctx, chain, user, msg) } @@ -97,7 +98,6 @@ func (s *InterchainAccountsTestSuite) TestMsgSubmitTx_SuccessfulTransfer() { }) t.Run("interchain account executes a bank transfer on behalf of the corresponding owner account", func(t *testing.T) { - t.Run("fund interchain account wallet", func(t *testing.T) { // fund the host account account so it has some $$ to send err := chainB.SendFunds(ctx, ibctest.FaucetAccountKeyName, ibc.WalletAmount{ diff --git a/e2e/tests/interchain_accounts/incentivized_test.go b/e2e/tests/interchain_accounts/incentivized_test.go index ae349c784ab..d9208d396d6 100644 --- a/e2e/tests/interchain_accounts/incentivized_test.go +++ b/e2e/tests/interchain_accounts/incentivized_test.go @@ -257,7 +257,6 @@ func (s *IncentivizedInterchainAccountsTestSuite) TestMsgSubmitTx_FailedBankSend }) t.Run("execute interchain account bank send through controller", func(t *testing.T) { - t.Run("register counterparty payee", func(t *testing.T) { resp, err := s.RegisterCounterPartyPayee(ctx, chainB, chainBRelayerUser, channelOutput.Counterparty.PortID, channelOutput.Counterparty.ChannelID, chainBRelayerWallet.Address, chainARelayerWallet.Address) s.Require().NoError(err) diff --git a/e2e/testsuite/testsuite.go b/e2e/testsuite/testsuite.go index 5de38e505e7..f3e27977143 100644 --- a/e2e/testsuite/testsuite.go +++ b/e2e/testsuite/testsuite.go @@ -236,7 +236,8 @@ func (s *E2ETestSuite) BroadcastMessages(ctx context.Context, chain *cosmos.Cosm // RegisterCounterPartyPayee broadcasts a MsgRegisterCounterpartyPayee message. func (s *E2ETestSuite) RegisterCounterPartyPayee(ctx context.Context, chain *cosmos.CosmosChain, - user *ibc.Wallet, portID, channelID, relayerAddr, counterpartyPayeeAddr string) (sdk.TxResponse, error) { + user *ibc.Wallet, portID, channelID, relayerAddr, counterpartyPayeeAddr string, +) (sdk.TxResponse, error) { msg := feetypes.NewMsgRegisterCounterpartyPayee(portID, channelID, relayerAddr, counterpartyPayeeAddr) return s.BroadcastMessages(ctx, chain, user, msg) } diff --git a/modules/core/04-channel/keeper/keeper_test.go b/modules/core/04-channel/keeper/keeper_test.go index ac97d72e7c3..953f5067844 100644 --- a/modules/core/04-channel/keeper/keeper_test.go +++ b/modules/core/04-channel/keeper/keeper_test.go @@ -85,7 +85,6 @@ func (suite *KeeperTestSuite) TestGetAppVersion() { // TestGetAllChannelsWithPortPrefix verifies ports are filtered correctly using a port prefix. func (suite *KeeperTestSuite) TestGetAllChannelsWithPortPrefix() { - const ( secondChannelID = "channel-1" differentChannelPortID = "different-portid"