merge artifact

cosmos · Nov 27, 2023 · fa1feb4 · fa1feb4
1 parent 6dba98c
commit fa1feb4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/e2e/tests/data/ics10_grandpa_cw.wasm.gz b/e2e/tests/data/ics10_grandpa_cw.wasm.gz
diff --git a/e2e/tests/wasm/grandpa_test.go b/e2e/tests/wasm/grandpa_test.go
@@ -161,7 +161,11 @@ func (s *GrandpaTestSuite) TestMsgTransfer_Succeeds_GrandpaContract() {
 		s.Require().Equal(expected, actualBalance.Int64())
 
 		// start relayer
+<<<<<<< Updated upstream
 		s.Require().NoError(r.StartRelayer(ctx, s.GetRelayerExecReporter(), s.GetPathName(0)))
+=======
+		s.Require().NoError(relayer.StartRelayer(ctx, s.GetRelayerExecReporter(), s.GetPathName(0)))
+>>>>>>> Stashed changes
 		err = testutil.WaitForBlocks(ctx, 15, polkadotChain, cosmosChain)
 		s.Require().NoError(err)