fixup for final refactor

Author: maru-ava

Taskfile.yml

@@ -89,6 +89,14 @@ tasks:
     desc: Generates protobuf
     cmd: ./scripts/protobuf_codegen.sh
 
+  ginkgo-build:
+    desc: Builds the current directory with ginkgo
+    cmd: ./scripts/run_ginkgo.sh build {{.USER_WORKING_DIR}} -- {{.CLI_ARGS}}
+
+  ginkgo-run:
+    desc: Tests the current directory with ginkgo
+    cmd: ./scripts/run_ginkgo.sh -v {{.USER_WORKING_DIR}} -- {{.CLI_ARGS}}
+
   install-nix:
     desc: Installs nix with the determinate systems installer
     cmd: curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install

tests/e2e/faultinjection/duplicate_node_id.go

@@ -44,7 +44,7 @@ var _ = ginkgo.Describe("Duplicate node handling", func() {
 		_ = e2e.AddEphemeralNode(tc, network, node2)
 
 		tc.By("checking that the second new node fails to become healthy before timeout")
-		err := tmpnet.WaitForHealthyNode(tc.DefaultContext(), tc.Log(), node2)
+		err := node2.WaitForHealthy(tc.DefaultContext())
 		require.ErrorIs(err, context.DeadlineExceeded)
 
 		tc.By("stopping the first new node")

tests/fixture/e2e/helpers.go

@@ -154,7 +154,7 @@ func WaitForHealthy(tc tests.TestContext, node *tmpnet.Node) {
 	// Need to use explicit context (vs DefaultContext()) to support use with DeferCleanup
 	ctx, cancel := context.WithTimeout(context.Background(), DefaultTimeout)
 	defer cancel()
-	require.NoError(tc, tmpnet.WaitForHealthyNode(ctx, tc.Log(), node))
+	require.NoError(tc, node.WaitForHealthy(ctx))
 }
 
 // Sends an eth transaction and waits for the transaction receipt from the
@@ -248,7 +248,7 @@ func CheckBootstrapIsPossible(tc tests.TestContext, network *tmpnet.Network) *tm
 	})
 
 	// Check that the node becomes healthy within timeout
-	require.NoError(tmpnet.WaitForHealthyNode(tc.DefaultContext(), tc.Log(), node))
+	require.NoError(node.WaitForHealthy(tc.DefaultContext()))
 
 	// Ensure that the primary validators are still healthy
 	for _, node := range network.Nodes {

tests/fixture/tmpnet/network.go

@@ -64,7 +64,8 @@ var (
 	// TODO(marun) Remove when subnet-evm configures the genesis with this key.
 	HardhatKey *secp256k1.PrivateKey
 
-	errInsufficientNodes = errors.New("at least one node is required")
+	errInsufficientNodes    = errors.New("at least one node is required")
+	errMissingRuntimeConfig = errors.New("DefaultRuntimeConfig must not be empty")
 )
 
 func init() {
@@ -262,6 +263,11 @@ func (n *Network) EnsureDefaultConfig(log logging.Logger) error {
 		}
 	}
 
+	emptyRuntime := NodeRuntimeConfig{}
+	if n.DefaultRuntimeConfig == emptyRuntime {
+		return errMissingRuntimeConfig
+	}
+
 	return nil
 }
 
@@ -528,7 +534,7 @@ func WaitForHealthyNodes(ctx context.Context, log logging.Logger, nodes ...*Node
 		log.Info("waiting for node to become healthy",
 			zap.Stringer("nodeID", node.NodeID),
 		)
-		if err := WaitForHealthyNode(ctx, log, node); err != nil {
+		if err := node.WaitForHealthy(ctx); err != nil {
 			return err
 		}
 	}

tests/fixture/tmpnet/network_test.go

@@ -20,6 +20,8 @@ func TestNetworkSerialization(t *testing.T) {
 	ctx := context.Background()
 
 	network := NewDefaultNetwork("testnet")
+	// Runtime configuration is required
+	network.DefaultRuntimeConfig.Process = &ProcessRuntimeConfig{}
 	// Validate round-tripping of primary subnet configuration
 	network.PrimarySubnetConfig = ConfigMap{
 		"validatorOnly": true,

tests/fixture/tmpnet/node.go

@@ -6,6 +6,7 @@ package tmpnet
 import (
 	"context"
 	"encoding/base64"
+	"errors"
 	"fmt"
 	"io"
 	"maps"
@@ -16,6 +17,8 @@ import (
 	"strings"
 	"time"
 
+	"go.uber.org/zap"
+
 	"github.com/ava-labs/avalanchego/config"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/staking"
@@ -412,3 +415,34 @@ func (n *Node) getLabels() map[string]string {
 	}
 	return labels
 }
+
+// WaitForHealthy blocks until node health is true or an error (including context timeout) is observed.
+func (n *Node) WaitForHealthy(ctx context.Context) error {
+	if _, ok := ctx.Deadline(); !ok {
+		return fmt.Errorf("unable to wait for health for node %q with a context without a deadline", n.NodeID)
+	}
+	ticker := time.NewTicker(DefaultNodeTickerInterval)
+	defer ticker.Stop()
+
+	for {
+		healthy, err := n.IsHealthy(ctx)
+		switch {
+		case errors.Is(err, ErrUnrecoverableNodeHealthCheck):
+			return fmt.Errorf("%w for node %q", err, n.NodeID)
+		case err != nil:
+			n.network.log.Verbo("Failed to query node health",
+				zap.Stringer("nodeID", n.NodeID),
+				zap.Error(err),
+			)
+			continue
+		case healthy:
+			return nil
+		}
+
+		select {
+		case <-ctx.Done():
+			return fmt.Errorf("failed to wait for health of node %q before timeout: %w", n.NodeID, ctx.Err())
+		case <-ticker.C:
+		}
+	}
+}

tests/fixture/tmpnet/utils.go

@@ -13,12 +13,9 @@ import (
 	"syscall"
 	"time"
 
-	"go.uber.org/zap"
-
 	"github.com/ava-labs/avalanchego/api/health"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/utils/crypto/secp256k1"
-	"github.com/ava-labs/avalanchego/utils/logging"
 )
 
 const (
@@ -50,37 +47,6 @@ func CheckNodeHealth(ctx context.Context, uri string) (*health.APIReply, error)
 	return nil, fmt.Errorf("%w: %w", ErrUnrecoverableNodeHealthCheck, err)
 }
 
-// WaitForHealthy blocks until Node.IsHealthy returns true or an error (including context timeout) is observed.
-func WaitForHealthyNode(ctx context.Context, log logging.Logger, node *Node) error {
-	if _, ok := ctx.Deadline(); !ok {
-		return fmt.Errorf("unable to wait for health for node %q with a context without a deadline", node.NodeID)
-	}
-	ticker := time.NewTicker(DefaultNodeTickerInterval)
-	defer ticker.Stop()
-
-	for {
-		healthy, err := node.IsHealthy(ctx)
-		switch {
-		case errors.Is(err, ErrUnrecoverableNodeHealthCheck):
-			return fmt.Errorf("%w for node %q", err, node.NodeID)
-		case err != nil:
-			log.Verbo("Failed to query node health",
-				zap.Stringer("nodeID", node.NodeID),
-				zap.Error(err),
-			)
-			continue
-		case healthy:
-			return nil
-		}
-
-		select {
-		case <-ctx.Done():
-			return fmt.Errorf("failed to wait for health of node %q before timeout: %w", node.NodeID, ctx.Err())
-		case <-ticker.C:
-		}
-	}
-}
-
 // NodeURI associates a node ID with its API URI.
 type NodeURI struct {
 	NodeID ids.NodeID