[e2e] Enhance post-test bootstrap checks

tests/e2e/c/dynamic_fees.go

@@ -162,6 +162,6 @@ var _ = e2e.DescribeCChain("[Dynamic Fees]", func() {
 			_ = e2e.SendEthTransaction(ethClient, signedTx)
 		})
 
-		e2e.CheckBootstrapIsPossible(privateNetwork)
+		_ = e2e.CheckBootstrapIsPossible(privateNetwork)
 	})
 })

tests/e2e/c/interchain_workflow.go

@@ -163,6 +163,6 @@ var _ = e2e.DescribeCChain("[Interchain Workflow]", func() {
 			require.Positive(balances[avaxAssetID])
 		})
 
-		e2e.CheckBootstrapIsPossible(e2e.Env.GetNetwork())
+		_ = e2e.CheckBootstrapIsPossible(e2e.Env.GetNetwork())
 	})
 })

tests/e2e/p/interchain_workflow.go

@@ -216,6 +216,6 @@ var _ = e2e.DescribePChain("[Interchain Workflow]", ginkgo.Label(e2e.UsesCChainL
 		ginkgo.By("stopping validator node to free up resources for a bootstrap check")
 		require.NoError(node.Stop(e2e.DefaultContext()))
 
-		e2e.CheckBootstrapIsPossible(network)
+		_ = e2e.CheckBootstrapIsPossible(network)
 	})
 })

tests/e2e/p/staking_rewards.go

@@ -305,6 +305,6 @@ var _ = ginkgo.Describe("[Staking Rewards]", func() {
 		ginkgo.By("stopping alpha to free up resources for a bootstrap check")
 		require.NoError(alphaNode.Stop(e2e.DefaultContext()))
 
-		e2e.CheckBootstrapIsPossible(network)
+		_ = e2e.CheckBootstrapIsPossible(network)
 	})
 })

tests/e2e/p/validator_sets.go

@@ -111,6 +111,6 @@ var _ = e2e.DescribePChain("[Validator Sets]", func() {
 			}
 		})
 
-		e2e.CheckBootstrapIsPossible(network)
+		_ = e2e.CheckBootstrapIsPossible(network)
 	})
 })

tests/e2e/vms/xsvm.go

@@ -160,6 +160,8 @@ var _ = ginkgo.Describe("[XSVM]", func() {
 		destinationBalance, err := destinationClient.Balance(e2e.DefaultContext(), destinationKey.Address(), sourceChain.ChainID)
 		require.NoError(err)
 		require.Equal(units.Schmeckle, destinationBalance)
+
+		_ = e2e.CheckBootstrapIsPossible(network)
 	})
 })
 

tests/e2e/x/interchain_workflow.go

@@ -151,6 +151,6 @@ var _ = e2e.DescribeXChain("[Interchain Workflow]", ginkgo.Label(e2e.UsesCChainL
 			require.Positive(balances[avaxAssetID])
 		})
 
-		e2e.CheckBootstrapIsPossible(e2e.Env.GetNetwork())
+		_ = e2e.CheckBootstrapIsPossible(e2e.Env.GetNetwork())
 	})
 })

tests/fixture/e2e/helpers.go

@@ -17,6 +17,7 @@ import (
 	"github.com/ava-labs/coreth/interfaces"
 	"github.com/stretchr/testify/require"
 
+	"github.com/ava-labs/avalanchego/config"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/tests"
 	"github.com/ava-labs/avalanchego/tests/fixture/tmpnet"
@@ -185,34 +186,41 @@ func WithSuggestedGasPrice(ethClient ethclient.Client) common.Option {
 	return common.WithBaseFee(baseFee)
 }
 
-// Verify that a new node can bootstrap into the network. This function is safe to call
-// from `Teardown` by virtue of not depending on ginkgo.DeferCleanup.
-func CheckBootstrapIsPossible(network *tmpnet.Network) {
+// Verify that a new node can bootstrap into the network. If the check wasn't skipped,
+// the node will be returned to the caller.
+func CheckBootstrapIsPossible(network *tmpnet.Network) *tmpnet.Node {
 	require := require.New(ginkgo.GinkgoT())
 
 	if len(os.Getenv(SkipBootstrapChecksEnvName)) > 0 {
 		tests.Outf("{{yellow}}Skipping bootstrap check due to the %s env var being set", SkipBootstrapChecksEnvName)
-		return
+		return nil
 	}
 	ginkgo.By("checking if bootstrap is possible with the current network state")
 
-	ctx, cancel := context.WithTimeout(context.Background(), DefaultTimeout)
-	defer cancel()
+	// Ensure all subnets are bootstrapped
+	subnetIDs := make([]string, len(network.Subnets))
+	for i, subnet := range network.Subnets {
+		subnetIDs[i] = subnet.SubnetID.String()
+	}
+	flags := tmpnet.FlagsMap{
+		config.TrackSubnetsKey: strings.Join(subnetIDs, ","),
+	}
 
-	node := tmpnet.NewEphemeralNode(tmpnet.FlagsMap{})
-	require.NoError(network.StartNode(ctx, ginkgo.GinkgoWriter, node))
+	node := tmpnet.NewEphemeralNode(flags)
+	require.NoError(network.StartNode(DefaultContext(), ginkgo.GinkgoWriter, node))
 	// StartNode will initiate node stop if an error is encountered during start,
 	// so no further cleanup effort is required if an error is seen here.
 
-	// Ensure the node is always stopped at the end of the check
-	defer func() {
-		ctx, cancel = context.WithTimeout(context.Background(), DefaultTimeout)
+	// Register a cleanup to ensure the node is stopped at the end of the test
+	ginkgo.DeferCleanup(func() {
+		ctx, cancel := context.WithTimeout(context.Background(), DefaultTimeout)
 		defer cancel()
 		require.NoError(node.Stop(ctx))
-	}()
+	})
 
 	// Check that the node becomes healthy within timeout
-	require.NoError(tmpnet.WaitForHealthy(ctx, node))
+	require.NoError(tmpnet.WaitForHealthy(DefaultContext(), node))
+	return node
 }
 
 // Start a temporary network with the provided avalanchego binary.

tests/upgrade/upgrade_test.go

@@ -59,6 +59,6 @@ var _ = ginkgo.Describe("[Upgrade]", func() {
 			e2e.WaitForHealthy(node)
 		}
 
-		e2e.CheckBootstrapIsPossible(network)
+		_ = e2e.CheckBootstrapIsPossible(network)
 	})
 })