Merge branch 'main' into fix_double_close

cosmos · Sep 27, 2022 · 2d7b4d5 · 2d7b4d5
2 parents 14f24d3 + 684ee62
commit 2d7b4d5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 0 deletions.
diff --git a/.github/workflows/build-skip.yml b/.github/workflows/build-skip.yml
@@ -1,5 +1,6 @@
 name: Build SimApp
 # This workflow allows to skip the build step if the PR does not contain any changes to the code
+# See https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks
 on:
   pull_request:
     paths-ignore:

diff --git a/.github/workflows/test-e2e-skip.yml b/.github/workflows/test-e2e-skip.yml
@@ -1,5 +1,6 @@
 name: Tests E2E
 # This workflow allows to skip the e2e step if the PR does not contain any changes to the code
+# See https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks
 on:
   pull_request:
     paths-ignore:

diff --git a/.github/workflows/test-integration-skip.yml b/.github/workflows/test-integration-skip.yml
@@ -1,5 +1,6 @@
 name: Tests Integration
 # This workflow allows to skip the integration step if the PR does not contain any changes to the code
+# See https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks
 on:
   pull_request:
     paths-ignore:

diff --git a/tests/e2e/group/tx.go b/tests/e2e/group/tx.go
@@ -2151,6 +2151,8 @@ func (s *IntegrationTestSuite) TestTxLeaveGroup() {
 		),
 	)
 	s.Require().NoError(err, out.String())
+	s.Require().NoError(s.network.WaitForNextBlock())
+
 	var txResp sdk.TxResponse
 	s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &txResp), out.String())
 	txResp, err = clitestutil.GetTxResponse(s.network, val.ClientCtx, txResp.TxHash)

diff --git a/x/auth/client/testutil/suite.go b/x/auth/client/testutil/suite.go
@@ -1587,6 +1587,7 @@ func (s *IntegrationTestSuite) TestSignWithMultiSignersAminoJSON() {
 	)
 	require.NoError(err)
 	require.NoError(s.network.WaitForNextBlock())
+	require.NoError(s.network.WaitForNextBlock())
 
 	var txRes sdk.TxResponse
 	require.NoError(val0.ClientCtx.Codec.UnmarshalJSON(res.Bytes(), &txRes))