Skip to content

Commit

Permalink
Merge branch 'main' into carlos/issue#2266-modulesapps27-interchain-a…
Browse files Browse the repository at this point in the history
…ccountscontrollertypes-paramsvalidate-suspiciously-performs-no-checks-yet-unnecessary-conversions-from-bool-to-interface-then-checks-if-value-is-a-bool-and-not-if-it-is-enabled
  • Loading branch information
Carlos Rodriguez authored Oct 5, 2022
2 parents e18b6f2 + 8c7c655 commit b840f1d
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/e2e-manual-icad.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
default: master
options:
- master
- v0.3.3
- v0.3.4
- v0.2.3
- v0.1.4
chain-b-tag:
Expand All @@ -34,7 +34,7 @@ on:
type: choice
options:
- master
- v0.3.3
- v0.3.4
- v0.2.3
- v0.1.4
relayer-tag:
Expand Down
20 changes: 10 additions & 10 deletions e2e/scripts/test-matricies/icad/test-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
20 changes: 10 additions & 10 deletions e2e/scripts/test-matricies/main/test-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/interchain_accounts/base_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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{
Expand Down
1 change: 0 additions & 1 deletion e2e/tests/interchain_accounts/incentivized_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion e2e/testsuite/testsuite.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
1 change: 0 additions & 1 deletion modules/core/04-channel/keeper/keeper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit b840f1d

Please sign in to comment.