Skip to content

Commit b21014e

Browse files
DimitrisJimcrodriguezvega
DimitrisJim
and
crodriguezvega
authored
refactor calls based on required error success in broadcast message. (#3475)
* refactor calls based on required error success in broadcast message. --------- Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
1 parent 6e8389a commit b21014e

14 files changed

+224
-324
lines changed

‎e2e/tests/core/03-connection/connection_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,8 @@ func (s *ConnectionTestSuite) TestMaxExpectedTimePerBlockParam() {
8989

9090
t.Run("ensure packets can be received, send from chainB to chainA", func(t *testing.T) {
9191
t.Run("send tokens from chainB to chainA", func(t *testing.T) {
92-
transferTxResp, err := s.Transfer(ctx, chainB, chainBWallet, channelA.Counterparty.PortID, channelA.Counterparty.ChannelID, testvalues.DefaultTransferAmount(chainBDenom), chainBAddress, chainAAddress, s.GetTimeoutHeight(ctx, chainA), 0, "")
93-
s.Require().NoError(err)
94-
s.AssertValidTxResponse(transferTxResp)
92+
transferTxResp := s.Transfer(ctx, chainB, chainBWallet, channelA.Counterparty.PortID, channelA.Counterparty.ChannelID, testvalues.DefaultTransferAmount(chainBDenom), chainBAddress, chainAAddress, s.GetTimeoutHeight(ctx, chainA), 0, "")
93+
s.AssertTxSuccess(transferTxResp)
9594
})
9695

9796
t.Run("tokens are escrowed", func(t *testing.T) {

‎e2e/tests/core/client_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,8 @@ func (s *ClientTestSuite) TestClient_Update_Misbehaviour() {
231231
msgUpdateClient, err := clienttypes.NewMsgUpdateClient(ibctesting.FirstClientID, maliciousHeader, rlyWallet.FormattedAddress())
232232
s.Require().NoError(err)
233233

234-
txResp, err := s.BroadcastMessages(ctx, chainA, rlyWallet, msgUpdateClient)
235-
s.Require().NoError(err)
236-
s.AssertValidTxResponse(txResp)
234+
txResp := s.BroadcastMessages(ctx, chainA, rlyWallet, msgUpdateClient)
235+
s.AssertTxSuccess(txResp)
237236
})
238237

239238
t.Run("ensure client status is frozen", func(t *testing.T) {

‎e2e/tests/interchain_accounts/base_test.go

+14-21
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,8 @@ func getICAVersion(chainAVersion, chainBVersion string) string {
4747

4848
// RegisterInterchainAccount will attempt to register an interchain account on the counterparty chain.
4949
func (s *InterchainAccountsTestSuite) RegisterInterchainAccount(ctx context.Context, chain *cosmos.CosmosChain, user ibc.Wallet, msgRegisterAccount *controllertypes.MsgRegisterInterchainAccount) {
50-
txResp, err := s.BroadcastMessages(ctx, chain, user, msgRegisterAccount)
51-
s.Require().NoError(err)
52-
s.AssertValidTxResponse(txResp)
50+
txResp := s.BroadcastMessages(ctx, chain, user, msgRegisterAccount)
51+
s.AssertTxSuccess(txResp)
5352
}
5453

5554
func (s *InterchainAccountsTestSuite) TestMsgSendTx_SuccessfulTransfer() {
@@ -72,9 +71,8 @@ func (s *InterchainAccountsTestSuite) TestMsgSendTx_SuccessfulTransfer() {
7271
version := getICAVersion(testconfig.GetChainATag(), testconfig.GetChainBTag())
7372
msgRegisterAccount := controllertypes.NewMsgRegisterInterchainAccount(ibctesting.FirstConnectionID, controllerAddress, version)
7473

75-
txResp, err := s.BroadcastMessages(ctx, chainA, controllerAccount, msgRegisterAccount)
76-
s.Require().NoError(err)
77-
s.AssertValidTxResponse(txResp)
74+
txResp := s.BroadcastMessages(ctx, chainA, controllerAccount, msgRegisterAccount)
75+
s.AssertTxSuccess(txResp)
7876
})
7977

8078
t.Run("start relayer", func(t *testing.T) {
@@ -123,15 +121,14 @@ func (s *InterchainAccountsTestSuite) TestMsgSendTx_SuccessfulTransfer() {
123121

124122
msgSendTx := controllertypes.NewMsgSendTx(controllerAccount.FormattedAddress(), ibctesting.FirstConnectionID, uint64(time.Hour.Nanoseconds()), packetData)
125123

126-
resp, err := s.BroadcastMessages(
124+
resp := s.BroadcastMessages(
127125
ctx,
128126
chainA,
129127
controllerAccount,
130128
msgSendTx,
131129
)
132130

133-
s.AssertValidTxResponse(resp)
134-
s.Require().NoError(err)
131+
s.AssertTxSuccess(resp)
135132

136133
s.Require().NoError(test.WaitForBlocks(ctx, 10, chainA, chainB))
137134
})
@@ -169,9 +166,8 @@ func (s *InterchainAccountsTestSuite) TestMsgSendTx_FailedTransfer_InsufficientF
169166
version := getICAVersion(testconfig.GetChainATag(), testconfig.GetChainBTag())
170167
msgRegisterAccount := controllertypes.NewMsgRegisterInterchainAccount(ibctesting.FirstConnectionID, controllerAddress, version)
171168

172-
txResp, err := s.BroadcastMessages(ctx, chainA, controllerAccount, msgRegisterAccount)
173-
s.Require().NoError(err)
174-
s.AssertValidTxResponse(txResp)
169+
txResp := s.BroadcastMessages(ctx, chainA, controllerAccount, msgRegisterAccount)
170+
s.AssertTxSuccess(txResp)
175171
})
176172

177173
t.Run("start relayer", func(t *testing.T) {
@@ -216,15 +212,14 @@ func (s *InterchainAccountsTestSuite) TestMsgSendTx_FailedTransfer_InsufficientF
216212

217213
msgSendTx := controllertypes.NewMsgSendTx(controllerAddress, ibctesting.FirstConnectionID, uint64(time.Hour.Nanoseconds()), packetData)
218214

219-
txResp, err := s.BroadcastMessages(
215+
txResp := s.BroadcastMessages(
220216
ctx,
221217
chainA,
222218
controllerAccount,
223219
msgSendTx,
224220
)
225221

226-
s.AssertValidTxResponse(txResp)
227-
s.Require().NoError(err)
222+
s.AssertTxSuccess(txResp)
228223

229224
s.Require().NoError(test.WaitForBlocks(ctx, 10, chainA, chainB))
230225
})
@@ -322,15 +317,14 @@ func (s *InterchainAccountsTestSuite) TestMsgSubmitTx_SuccessfulTransfer_AfterRe
322317

323318
msgSendTx := controllertypes.NewMsgSendTx(controllerAddress, ibctesting.FirstConnectionID, uint64(1), packetData)
324319

325-
resp, err := s.BroadcastMessages(
320+
resp := s.BroadcastMessages(
326321
ctx,
327322
chainA,
328323
controllerAccount,
329324
msgSendTx,
330325
)
331326

332-
s.AssertValidTxResponse(resp)
333-
s.Require().NoError(err)
327+
s.AssertTxSuccess(resp)
334328

335329
// this sleep is to allow the packet to timeout
336330
time.Sleep(1 * time.Second)
@@ -397,15 +391,14 @@ func (s *InterchainAccountsTestSuite) TestMsgSubmitTx_SuccessfulTransfer_AfterRe
397391

398392
msgSendTx := controllertypes.NewMsgSendTx(controllerAddress, ibctesting.FirstConnectionID, uint64(5*time.Minute), packetData)
399393

400-
resp, err := s.BroadcastMessages(
394+
resp := s.BroadcastMessages(
401395
ctx,
402396
chainA,
403397
controllerAccount,
404398
msgSendTx,
405399
)
406400

407-
s.AssertValidTxResponse(resp)
408-
s.Require().NoError(err)
401+
s.AssertTxSuccess(resp)
409402

410403
// time for the packet to be relayed
411404
s.Require().NoError(test.WaitForBlocks(ctx, 5, chainA, chainB))

‎e2e/tests/interchain_accounts/groups_test.go

+10-15
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,8 @@ func (s *InterchainAccountsGroupsTestSuite) TestInterchainAccountsGroupsIntegrat
103103
msgCreateGroupWithPolicy, err := grouptypes.NewMsgCreateGroupWithPolicy(chainAAddress, members, DefaultMetadata, DefaultMetadata, true, decisionPolicy)
104104
s.Require().NoError(err)
105105

106-
txResp, err := s.BroadcastMessages(ctx, chainA, chainAWallet, msgCreateGroupWithPolicy)
107-
s.Require().NoError(err)
108-
s.AssertValidTxResponse(txResp)
106+
txResp := s.BroadcastMessages(ctx, chainA, chainAWallet, msgCreateGroupWithPolicy)
107+
s.AssertTxSuccess(txResp)
109108
})
110109

111110
t.Run("submit proposal for MsgRegisterInterchainAccount", func(t *testing.T) {
@@ -115,9 +114,8 @@ func (s *InterchainAccountsGroupsTestSuite) TestInterchainAccountsGroupsIntegrat
115114
msgSubmitProposal, err := grouptypes.NewMsgSubmitProposal(groupPolicyAddr, []string{chainAAddress}, []sdk.Msg{msgRegisterAccount}, DefaultMetadata, grouptypes.Exec_EXEC_UNSPECIFIED, "e2e groups proposal: for MsgRegisterInterchainAccount", "e2e groups proposal: for MsgRegisterInterchainAccount")
116115
s.Require().NoError(err)
117116

118-
txResp, err := s.BroadcastMessages(ctx, chainA, chainAWallet, msgSubmitProposal)
119-
s.Require().NoError(err)
120-
s.AssertValidTxResponse(txResp)
117+
txResp := s.BroadcastMessages(ctx, chainA, chainAWallet, msgSubmitProposal)
118+
s.AssertTxSuccess(txResp)
121119
})
122120

123121
t.Run("vote and exec proposal", func(t *testing.T) {
@@ -128,9 +126,8 @@ func (s *InterchainAccountsGroupsTestSuite) TestInterchainAccountsGroupsIntegrat
128126
Exec: grouptypes.Exec_EXEC_TRY,
129127
}
130128

131-
txResp, err := s.BroadcastMessages(ctx, chainA, chainAWallet, msgVote)
132-
s.Require().NoError(err)
133-
s.AssertValidTxResponse(txResp)
129+
txResp := s.BroadcastMessages(ctx, chainA, chainAWallet, msgVote)
130+
s.AssertTxSuccess(txResp)
134131
})
135132

136133
t.Run("start relayer", func(t *testing.T) {
@@ -178,9 +175,8 @@ func (s *InterchainAccountsGroupsTestSuite) TestInterchainAccountsGroupsIntegrat
178175
msgSubmitProposal, err := grouptypes.NewMsgSubmitProposal(groupPolicyAddr, []string{chainAAddress}, []sdk.Msg{msgSubmitTx}, DefaultMetadata, grouptypes.Exec_EXEC_UNSPECIFIED, "e2e groups proposal: for MsgRegisterInterchainAccount", "e2e groups proposal: for MsgRegisterInterchainAccount")
179176
s.Require().NoError(err)
180177

181-
txResp, err := s.BroadcastMessages(ctx, chainA, chainAWallet, msgSubmitProposal)
182-
s.Require().NoError(err)
183-
s.AssertValidTxResponse(txResp)
178+
txResp := s.BroadcastMessages(ctx, chainA, chainAWallet, msgSubmitProposal)
179+
s.AssertTxSuccess(txResp)
184180
})
185181

186182
t.Run("vote and exec proposal", func(t *testing.T) {
@@ -191,9 +187,8 @@ func (s *InterchainAccountsGroupsTestSuite) TestInterchainAccountsGroupsIntegrat
191187
Exec: grouptypes.Exec_EXEC_TRY,
192188
}
193189

194-
txResp, err := s.BroadcastMessages(ctx, chainA, chainAWallet, msgVote)
195-
s.Require().NoError(err)
196-
s.AssertValidTxResponse(txResp)
190+
txResp := s.BroadcastMessages(ctx, chainA, chainAWallet, msgVote)
191+
s.AssertTxSuccess(txResp)
197192
})
198193

199194
t.Run("verify tokens transferred", func(t *testing.T) {

‎e2e/tests/interchain_accounts/incentivized_test.go

+12-18
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,8 @@ func (s *IncentivizedInterchainAccountsTestSuite) TestMsgSendTx_SuccessfulBankSe
6969
version := getICAVersion(testconfig.GetChainATag(), testconfig.GetChainBTag())
7070
msgRegisterAccount := controllertypes.NewMsgRegisterInterchainAccount(ibctesting.FirstConnectionID, controllerAccount.FormattedAddress(), version)
7171

72-
txResp, err := s.BroadcastMessages(ctx, chainA, controllerAccount, msgRegisterAccount)
73-
s.Require().NoError(err)
74-
s.AssertValidTxResponse(txResp)
72+
txResp := s.BroadcastMessages(ctx, chainA, controllerAccount, msgRegisterAccount)
73+
s.AssertTxSuccess(txResp)
7574
})
7675

7776
t.Run("start relayer", func(t *testing.T) {
@@ -107,9 +106,8 @@ func (s *IncentivizedInterchainAccountsTestSuite) TestMsgSendTx_SuccessfulBankSe
107106
})
108107

109108
t.Run("register counterparty payee", func(t *testing.T) {
110-
resp, err := s.RegisterCounterPartyPayee(ctx, chainB, chainBRelayerUser, channelOutput.Counterparty.PortID, channelOutput.Counterparty.ChannelID, chainBRelayerWallet.FormattedAddress(), chainARelayerWallet.FormattedAddress())
111-
s.Require().NoError(err)
112-
s.AssertValidTxResponse(resp)
109+
resp := s.RegisterCounterPartyPayee(ctx, chainB, chainBRelayerUser, channelOutput.Counterparty.PortID, channelOutput.Counterparty.ChannelID, chainBRelayerWallet.FormattedAddress(), chainARelayerWallet.FormattedAddress())
110+
s.AssertTxSuccess(resp)
113111
})
114112

115113
t.Run("verify counterparty payee", func(t *testing.T) {
@@ -154,9 +152,8 @@ func (s *IncentivizedInterchainAccountsTestSuite) TestMsgSendTx_SuccessfulBankSe
154152

155153
msgSendTx := controllertypes.NewMsgSendTx(controllerAccount.FormattedAddress(), ibctesting.FirstConnectionID, uint64(time.Hour.Nanoseconds()), packetData)
156154

157-
resp, err := s.BroadcastMessages(ctx, chainA, controllerAccount, msgPayPacketFee, msgSendTx)
158-
s.AssertValidTxResponse(resp)
159-
s.Require().NoError(err)
155+
resp := s.BroadcastMessages(ctx, chainA, controllerAccount, msgPayPacketFee, msgSendTx)
156+
s.AssertTxSuccess(resp)
160157

161158
s.Require().NoError(test.WaitForBlocks(ctx, 1, chainA, chainB))
162159
})
@@ -250,9 +247,8 @@ func (s *IncentivizedInterchainAccountsTestSuite) TestMsgSendTx_FailedBankSend_I
250247
version := getICAVersion(testconfig.GetChainATag(), testconfig.GetChainBTag())
251248
msgRegisterAccount := controllertypes.NewMsgRegisterInterchainAccount(ibctesting.FirstConnectionID, controllerAccount.FormattedAddress(), version)
252249

253-
txResp, err := s.BroadcastMessages(ctx, chainA, controllerAccount, msgRegisterAccount)
254-
s.Require().NoError(err)
255-
s.AssertValidTxResponse(txResp)
250+
txResp := s.BroadcastMessages(ctx, chainA, controllerAccount, msgRegisterAccount)
251+
s.AssertTxSuccess(txResp)
256252
})
257253

258254
t.Run("start relayer", func(t *testing.T) {
@@ -278,9 +274,8 @@ func (s *IncentivizedInterchainAccountsTestSuite) TestMsgSendTx_FailedBankSend_I
278274

279275
t.Run("execute interchain account bank send through controller", func(t *testing.T) {
280276
t.Run("register counterparty payee", func(t *testing.T) {
281-
resp, err := s.RegisterCounterPartyPayee(ctx, chainB, chainBRelayerUser, channelOutput.Counterparty.PortID, channelOutput.Counterparty.ChannelID, chainBRelayerWallet.FormattedAddress(), chainARelayerWallet.FormattedAddress())
282-
s.Require().NoError(err)
283-
s.AssertValidTxResponse(resp)
277+
resp := s.RegisterCounterPartyPayee(ctx, chainB, chainBRelayerUser, channelOutput.Counterparty.PortID, channelOutput.Counterparty.ChannelID, chainBRelayerWallet.FormattedAddress(), chainARelayerWallet.FormattedAddress())
278+
s.AssertTxSuccess(resp)
284279
})
285280

286281
t.Run("verify counterparty payee", func(t *testing.T) {
@@ -326,9 +321,8 @@ func (s *IncentivizedInterchainAccountsTestSuite) TestMsgSendTx_FailedBankSend_I
326321

327322
msgSendTx := controllertypes.NewMsgSendTx(controllerAccount.FormattedAddress(), ibctesting.FirstConnectionID, uint64(time.Hour.Nanoseconds()), packetData)
328323

329-
resp, err := s.BroadcastMessages(ctx, chainA, controllerAccount, msgPayPacketFee, msgSendTx)
330-
s.AssertValidTxResponse(resp)
331-
s.Require().NoError(err)
324+
resp := s.BroadcastMessages(ctx, chainA, controllerAccount, msgPayPacketFee, msgSendTx)
325+
s.AssertTxSuccess(resp)
332326

333327
s.Require().NoError(test.WaitForBlocks(ctx, 1, chainA, chainB))
334328
})

‎e2e/tests/interchain_accounts/intertx_incentivized_test.go

+12-16
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ func (s *IncentivizedInterTxTestSuite) TestMsgSubmitTx_SuccessfulBankSend_Incent
6363
t.Run("register interchain account", func(t *testing.T) {
6464
version := "" // allow app to handle the version as appropriate.
6565
msgRegisterAccount := intertxtypes.NewMsgRegisterAccount(controllerAccount.FormattedAddress(), ibctesting.FirstConnectionID, version)
66-
err := s.RegisterInterchainAccount(ctx, chainA, controllerAccount, msgRegisterAccount)
67-
s.Require().NoError(err)
66+
txResp := s.BroadcastMessages(ctx, chainA, controllerAccount, msgRegisterAccount)
67+
s.AssertTxSuccess(txResp)
6868
})
6969

7070
t.Run("start relayer", func(t *testing.T) {
@@ -98,9 +98,8 @@ func (s *IncentivizedInterTxTestSuite) TestMsgSubmitTx_SuccessfulBankSend_Incent
9898
})
9999

100100
t.Run("register counterparty payee", func(t *testing.T) {
101-
resp, err := s.RegisterCounterPartyPayee(ctx, chainB, chainBRelayerUser, channelOutput.Counterparty.PortID, channelOutput.Counterparty.ChannelID, chainBRelayerWallet.FormattedAddress(), chainARelayerWallet.FormattedAddress())
102-
s.Require().NoError(err)
103-
s.AssertValidTxResponse(resp)
101+
resp := s.RegisterCounterPartyPayee(ctx, chainB, chainBRelayerUser, channelOutput.Counterparty.PortID, channelOutput.Counterparty.ChannelID, chainBRelayerWallet.FormattedAddress(), chainARelayerWallet.FormattedAddress())
102+
s.AssertTxSuccess(resp)
104103
})
105104

106105
t.Run("verify counterparty payee", func(t *testing.T) {
@@ -136,9 +135,8 @@ func (s *IncentivizedInterTxTestSuite) TestMsgSubmitTx_SuccessfulBankSend_Incent
136135
msgSubmitTx, err := intertxtypes.NewMsgSubmitTx(msgSend, ibctesting.FirstConnectionID, controllerAccount.FormattedAddress())
137136
s.Require().NoError(err)
138137

139-
resp, err := s.BroadcastMessages(ctx, chainA, controllerAccount, msgPayPacketFee, msgSubmitTx)
140-
s.AssertValidTxResponse(resp)
141-
s.Require().NoError(err)
138+
resp := s.BroadcastMessages(ctx, chainA, controllerAccount, msgPayPacketFee, msgSubmitTx)
139+
s.AssertTxSuccess(resp)
142140

143141
s.Require().NoError(test.WaitForBlocks(ctx, 1, chainA, chainB))
144142
})
@@ -231,8 +229,8 @@ func (s *IncentivizedInterTxTestSuite) TestMsgSubmitTx_FailedBankSend_Incentiviz
231229
t.Run("register interchain account", func(t *testing.T) {
232230
version := "" // allow app to handle the version as appropriate.
233231
msgRegisterAccount := intertxtypes.NewMsgRegisterAccount(controllerAccount.FormattedAddress(), ibctesting.FirstConnectionID, version)
234-
err := s.RegisterInterchainAccount(ctx, chainA, controllerAccount, msgRegisterAccount)
235-
s.Require().NoError(err)
232+
txResp := s.BroadcastMessages(ctx, chainA, controllerAccount, msgRegisterAccount)
233+
s.AssertTxSuccess(txResp)
236234
})
237235

238236
t.Run("start relayer", func(t *testing.T) {
@@ -258,9 +256,8 @@ func (s *IncentivizedInterTxTestSuite) TestMsgSubmitTx_FailedBankSend_Incentiviz
258256

259257
t.Run("execute interchain account bank send through controller", func(t *testing.T) {
260258
t.Run("register counterparty payee", func(t *testing.T) {
261-
resp, err := s.RegisterCounterPartyPayee(ctx, chainB, chainBRelayerUser, channelOutput.Counterparty.PortID, channelOutput.Counterparty.ChannelID, chainBRelayerWallet.FormattedAddress(), chainARelayerWallet.FormattedAddress())
262-
s.Require().NoError(err)
263-
s.AssertValidTxResponse(resp)
259+
resp := s.RegisterCounterPartyPayee(ctx, chainB, chainBRelayerUser, channelOutput.Counterparty.PortID, channelOutput.Counterparty.ChannelID, chainBRelayerWallet.FormattedAddress(), chainARelayerWallet.FormattedAddress())
260+
s.AssertTxSuccess(resp)
264261
})
265262

266263
t.Run("verify counterparty payee", func(t *testing.T) {
@@ -297,9 +294,8 @@ func (s *IncentivizedInterTxTestSuite) TestMsgSubmitTx_FailedBankSend_Incentiviz
297294
msgSubmitTx, err := intertxtypes.NewMsgSubmitTx(msgSend, ibctesting.FirstConnectionID, controllerAccount.FormattedAddress())
298295
s.Require().NoError(err)
299296

300-
resp, err := s.BroadcastMessages(ctx, chainA, controllerAccount, msgPayPacketFee, msgSubmitTx)
301-
s.AssertValidTxResponse(resp)
302-
s.Require().NoError(err)
297+
resp := s.BroadcastMessages(ctx, chainA, controllerAccount, msgPayPacketFee, msgSubmitTx)
298+
s.AssertTxSuccess(resp)
303299

304300
s.Require().NoError(test.WaitForBlocks(ctx, 1, chainA, chainB))
305301
})

0 commit comments

Comments
 (0)