Schedule Helicon in the antithesis tests (#5649)

Author: StephenButtolph

tests/antithesis/avalanchego/gencomposeconfig/main.go

@@ -4,6 +4,7 @@
 package main
 
 import (
+	"fmt"
 	"os"
 
 	"go.uber.org/zap"
@@ -13,15 +14,46 @@ import (
 	"github.com/ava-labs/avalanchego/tests/fixture/tmpnet"
 )
 
-const baseImageName = "antithesis-avalanchego"
+const (
+	baseImageName = "antithesis-avalanchego"
+	nodeCount     = 5
+)
 
 // Creates docker-compose.yml and its associated volumes in the target path.
 func main() {
-	network := tmpnet.LocalNetworkOrPanic()
+	log := tests.NewDefaultLogger("")
+	network, err := newNetwork()
+	if err != nil {
+		log.Fatal("failed to configure network",
+			zap.Error(err),
+		)
+		os.Exit(1)
+	}
 	if err := antithesis.GenerateComposeConfig(network, baseImageName); err != nil {
-		tests.NewDefaultLogger("").Fatal("failed to generate compose config",
+		log.Fatal("failed to generate compose config",
 			zap.Error(err),
 		)
 		os.Exit(1)
 	}
 }
+
+// newNetwork returns a network with all upgrades initially active. A custom
+// network is required because nodes refuse to override the local network's
+// upgrade schedule.
+func newNetwork() (*tmpnet.Network, error) {
+	network := &tmpnet.Network{
+		Owner: baseImageName,
+		Nodes: tmpnet.NewNodesOrPanic(nodeCount),
+	}
+	genesis, err := network.DefaultGenesis()
+	if err != nil {
+		return nil, fmt.Errorf("failed to create genesis: %w", err)
+	}
+	network.Genesis = genesis
+
+	network.DefaultFlags, err = tmpnet.UpgradeFlags(tmpnet.UpgradeConfig(0))
+	if err != nil {
+		return nil, fmt.Errorf("failed to get upgrade flags: %w", err)
+	}
+	return network, nil
+}

tests/antithesis/compose.go

@@ -167,7 +167,7 @@ func newComposeProject(network *tmpnet.Network, nodeImageName string, workloadIm
 		signerKey := node.Flags[config.StakingSignerKeyContentKey]
 
 		env := types.Mapping{
-			config.NetworkNameKey:             constants.LocalName,
+			config.NetworkNameKey:             constants.NetworkName(network.GetNetworkID()),
 			config.LogLevelKey:                logging.Debug.String(),
 			config.LogDisplayLevelKey:         logging.Trace.String(),
 			config.LogFormatKey:               logging.JSONString,
@@ -178,10 +178,20 @@ func newComposeProject(network *tmpnet.Network, nodeImageName string, workloadIm
 			config.StakingSignerKeyContentKey: signerKey,
 			config.ChainConfigContentKey:      chainConfigContent,
 		}
+		if network.Genesis != nil {
+			content, err := network.GetGenesisFileContent()
+			if err != nil {
+				return nil, fmt.Errorf("failed to get genesis file content: %w", err)
+			}
+			env[config.GenesisFileContentKey] = content
+		}
 
 		// Apply configuration appropriate to a test network
 		maps.Copy(env, tmpnet.DefaultTmpnetFlags())
 
+		// Apply the network's default flags (e.g. upgrade configuration)
+		maps.Copy(env, network.DefaultFlags)
+
 		serviceName := getServiceName(i)
 
 		volumes := []types.ServiceVolumeConfig{

tests/e2e/BUILD.bazel

@@ -13,7 +13,6 @@ go_test(
     srcs = ["e2e_test.go"],
     tags = ["manual"],  # keep
     deps = [
-        "//config",
         "//graft/coreth/plugin/evm",
         "//tests/e2e/banff",
         "//tests/e2e/c",
@@ -24,8 +23,6 @@ go_test(
         "//tests/e2e/x/transfer",
         "//tests/fixture/e2e",
         "//tests/fixture/tmpnet",
-        "//upgrade",
-        "//upgrade/upgradetest",
         "@com_github_onsi_ginkgo_v2//:ginkgo",
         "@com_github_stretchr_testify//require",
         "@org_uber_go_zap//:zap",

tests/e2e/e2e_test.go

@@ -4,10 +4,7 @@
 package e2e_test
 
 import (
-	"encoding/base64"
-	"encoding/json"
 	"testing"
-	"time"
 
 	"github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/require"
@@ -21,13 +18,10 @@ import (
 	_ "github.com/ava-labs/avalanchego/tests/e2e/x"
 	_ "github.com/ava-labs/avalanchego/tests/e2e/x/transfer"
 
-	"github.com/ava-labs/avalanchego/config"
 	"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm"
 	"github.com/ava-labs/avalanchego/tests/e2e/vms"
 	"github.com/ava-labs/avalanchego/tests/fixture/e2e"
 	"github.com/ava-labs/avalanchego/tests/fixture/tmpnet"
-	"github.com/ava-labs/avalanchego/upgrade"
-	"github.com/ava-labs/avalanchego/upgrade/upgradetest"
 )
 
 func TestE2E(t *testing.T) {
@@ -41,29 +35,6 @@ func init() {
 	flagVars = e2e.RegisterFlags(e2e.WithDefaultOwner("avalanchego-e2e"))
 }
 
-// upgradeConfig configures the latest upgrade:
-//   - activateLatestAfter < 0: leave latest unscheduled
-//   - activateLatestAfter == 0: activate latest from genesis
-//   - activateLatestAfter > 0: schedule latest that duration after starting
-func upgradeConfig(activateLatestAfter time.Duration) upgrade.Config {
-	const previous = upgradetest.Latest - 1
-	var upgrades upgrade.Config
-	switch {
-	case activateLatestAfter < 0:
-		upgrades = upgradetest.GetConfig(previous)
-	case activateLatestAfter == 0:
-		upgrades = upgradetest.GetConfig(upgradetest.Latest)
-	default:
-		upgrades = upgradetest.GetConfigWithUpgradeTime(
-			upgradetest.Latest,
-			time.Now().Add(activateLatestAfter),
-		)
-		upgradetest.SetTimesTo(&upgrades, previous, upgrade.InitiallyActiveTime)
-	}
-	upgrades.GraniteEpochDuration = 4 * time.Second
-	return upgrades
-}
-
 var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
 	// Run only once in the first ginkgo process
 
@@ -74,22 +45,13 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
 	nodes := tmpnet.NewNodesOrPanic(nodeCount)
 	subnets := vms.XSVMSubnetsOrPanic(nodes...)
 
-	upgrades := upgradeConfig(flagVars.ActivateLatestAfter())
+	upgrades := tmpnet.UpgradeConfig(flagVars.ActivateLatestAfter())
 	tc.Log().Info("setting upgrades",
 		zap.Reflect("upgrades", upgrades),
 	)
 
-	upgradeJSON, err := json.Marshal(upgrades)
+	defaultFlags, err := tmpnet.UpgradeFlags(upgrades)
 	require.NoError(tc, err)
-
-	upgradeBase64 := base64.StdEncoding.EncodeToString(upgradeJSON)
-
-	defaultFlags := tmpnet.FlagsMap{
-		config.UpgradeFileContentKey: upgradeBase64,
-		// Ensure a min stake duration compatible with testing staking logic
-		config.MinStakeDurationKey:        "2s",
-		config.HeliconMinStakeDurationKey: "1s",
-	}
 	defaultFlags.SetDefaults(tmpnet.DefaultE2EFlags())
 
 	return e2e.NewTestEnvironment(

tests/fixture/tmpnet/BUILD.bazel

@@ -41,6 +41,7 @@ go_library(
         "//staking",
         "//tests/fixture/stacktrace",
         "//upgrade",
+        "//upgrade/upgradetest",
         "//utils/constants",
         "//utils/crypto/bls/signer/localsigner",
         "//utils/crypto/secp256k1",

tests/fixture/tmpnet/network.go

@@ -29,6 +29,8 @@ import (
 	"github.com/ava-labs/avalanchego/genesis"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/tests/fixture/stacktrace"
+	"github.com/ava-labs/avalanchego/upgrade"
+	"github.com/ava-labs/avalanchego/upgrade/upgradetest"
 	"github.com/ava-labs/avalanchego/utils/constants"
 	"github.com/ava-labs/avalanchego/utils/crypto/secp256k1"
 	"github.com/ava-labs/avalanchego/utils/logging"
@@ -368,6 +370,43 @@ func (n *Network) DefaultGenesis() (*genesis.UnparsedConfig, error) {
 	return NewTestGenesis(defaultNetworkID, n.Nodes, keysToFund)
 }
 
+// UpgradeConfig configures the latest upgrade:
+//   - activateLatestAfter < 0: leave latest unscheduled
+//   - activateLatestAfter == 0: activate latest from genesis
+//   - activateLatestAfter > 0: schedule latest that duration after starting
+func UpgradeConfig(activateLatestAfter time.Duration) upgrade.Config {
+	const previous = upgradetest.Latest - 1
+	var upgrades upgrade.Config
+	switch {
+	case activateLatestAfter < 0:
+		upgrades = upgradetest.GetConfig(previous)
+	case activateLatestAfter == 0:
+		upgrades = upgradetest.GetConfig(upgradetest.Latest)
+	default:
+		upgrades = upgradetest.GetConfigWithUpgradeTime(
+			upgradetest.Latest,
+			time.Now().Add(activateLatestAfter),
+		)
+		upgradetest.SetTimesTo(&upgrades, previous, upgrade.InitiallyActiveTime)
+	}
+	upgrades.GraniteEpochDuration = 4 * time.Second
+	return upgrades
+}
+
+// UpgradeFlags returns flags applying the provided upgrade schedule
+// and a min stake duration compatible with testing staking logic.
+func UpgradeFlags(upgrades upgrade.Config) (FlagsMap, error) {
+	upgradeJSON, err := json.Marshal(upgrades)
+	if err != nil {
+		return nil, stacktrace.Errorf("failed to marshal upgrade config: %w", err)
+	}
+	return FlagsMap{
+		config.UpgradeFileContentKey:      base64.StdEncoding.EncodeToString(upgradeJSON),
+		config.MinStakeDurationKey:        DefaultMinStakeDuration,
+		config.HeliconMinStakeDurationKey: DefaultHeliconMinStakeDuration,
+	}, nil
+}
+
 // Starts the specified nodes
 func (n *Network) StartNodes(ctx context.Context, log logging.Logger, nodesToStart ...*Node) error {
 	if len(nodesToStart) == 0 {