Merge branch 'master' into bump-avalanchego

ava-labs · Aug 2, 2023 · e7c4025 · e7c4025
2 parents a2d4c74 + dd6dcad
commit e7c4025
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/tests/utils/runner/network_manager.go b/tests/utils/runner/network_manager.go
@@ -249,8 +249,8 @@ func (n *NetworkManager) SetupNetwork(ctx context.Context, execPath string, bloc
 	}
 	nodeInfos := status.GetClusterInfo().GetNodeInfos()
 
-	for _, chainSpec := range blockchainSpecs {
-		blockchainIDStr := sresp.ChainIds[0]
+	for i, chainSpec := range blockchainSpecs {
+		blockchainIDStr := sresp.ChainIds[i]
 		blockchainID, err := ids.FromString(blockchainIDStr)
 		if err != nil {
 			panic(err)

diff --git a/tests/warp/warp_test.go b/tests/warp/warp_test.go
@@ -335,6 +335,15 @@ var _ = ginkgo.Describe("[Warp]", ginkgo.Ordered, func() {
 		log.Info("Transaction triggered new block", "blockHash", newHead.Hash())
 		nonce++
 
+		triggerTx, err = types.SignTx(types.NewTransaction(nonce, fundedAddress, common.Big1, 21_000, big.NewInt(225*params.GWei), nil), txSigner, fundedKey)
+		gomega.Expect(err).Should(gomega.BeNil())
+
+		err = chainBWSClient.SendTransaction(ctx, triggerTx)
+		gomega.Expect(err).Should(gomega.BeNil())
+		newHead = <-newHeads
+		log.Info("Transaction triggered new block", "blockHash", newHead.Hash())
+		nonce++
+
 		packedInput, err := warp.PackGetVerifiedWarpMessage()
 		gomega.Expect(err).Should(gomega.BeNil())
 		tx := predicateutils.NewPredicateTx(