fixup: Use a private network

Author: maru-ava

tests/e2e/c/dynamic_fees.go

@@ -39,12 +39,17 @@ var _ = e2e.DescribeCChainSerial("[Dynamic Fees]", func() {
 	gasTip := big.NewInt(1000 * params.GWei)
 
 	ginkgo.It("should ensure that the gas price is affected by load", func() {
+		ginkgo.By("creating a new private network to ensure isolation from other tests")
+		privateNetwork := e2e.Env.NewPrivateNetwork()
+
 		ginkgo.By("allocating a pre-funded key")
-		key := e2e.Env.AllocateFundedKey()
+		key := privateNetwork.GetConfig().FundedKeys[0]
 		ethAddress := evm.GetEthAddress(key)
 
 		ginkgo.By("initializing a coreth client")
-		ethClient := e2e.Env.NewEthClient(e2e.Env.GetRandomNodeURI())
+		nodes := privateNetwork.GetNodes()
+		nodeURI := nodes[0].GetProcessContext().URI
+		ethClient := e2e.Env.NewEthClient(nodeURI)
 
 		ginkgo.By("initializing a transaction signer")
 		cChainID, err := ethClient.ChainID(e2e.DefaultContext())
@@ -157,6 +162,6 @@ var _ = e2e.DescribeCChainSerial("[Dynamic Fees]", func() {
 			e2e.SendEthTransaction(ethClient, signedTx)
 		})
 
-		e2e.CheckBootstrapIsPossible(e2e.Env.GetNetwork())
+		e2e.CheckBootstrapIsPossible(privateNetwork)
 	})
 })

tests/e2e/e2e.go

@@ -11,6 +11,7 @@ import (
 	"fmt"
 	"math/rand"
 	"os"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -30,6 +31,7 @@ import (
 	"github.com/ava-labs/avalanchego/tests/fixture/testnet"
 	"github.com/ava-labs/avalanchego/tests/fixture/testnet/local"
 	"github.com/ava-labs/avalanchego/utils/crypto/secp256k1"
+	"github.com/ava-labs/avalanchego/utils/perms"
 	"github.com/ava-labs/avalanchego/vms/secp256k1fx"
 	"github.com/ava-labs/avalanchego/wallet/subnet/primary"
 	"github.com/ava-labs/avalanchego/wallet/subnet/primary/common"
@@ -62,6 +64,14 @@ const (
 	// checks. Useful for speeding up iteration during test
 	// development.
 	SkipBootstrapChecksEnvName = "E2E_SKIP_BOOTSTRAP_CHECKS"
+
+	// An empty string prompts the use of the default path which ensures a
+	// predictable target for github's upload-artifact action.
+	DefaultNetworkDir = ""
+
+	// Directory used to store private networks (specific to a single test)
+	// under the shared network dir.
+	PrivateNetworksDirName = "private_networks"
 )
 
 // Env is used to access shared test fixture. Intended to be
@@ -127,6 +137,7 @@ func (te *TestEnvironment) NewKeychain(count int) *secp256k1fx.Keychain {
 }
 
 // Create a new wallet for the provided keychain against the specified node URI.
+// TODO(marun) Make this a regular function.
 func (te *TestEnvironment) NewWallet(keychain *secp256k1fx.Keychain, uri string) primary.Wallet {
 	tests.Outf("{{blue}} initializing a new wallet for URI: %s {{/}}\n", uri)
 	wallet, err := primary.MakeWallet(DefaultContext(), &primary.WalletConfig{
@@ -139,6 +150,7 @@ func (te *TestEnvironment) NewWallet(keychain *secp256k1fx.Keychain, uri string)
 }
 
 // Create a new eth client targeting the specified node URI.
+// TODO(marun) Make this a regular function.
 func (te *TestEnvironment) NewEthClient(nodeURI string) ethclient.Client {
 	tests.Outf("{{blue}} initializing a new eth client for URI: %s {{/}}\n", nodeURI)
 	nodeAddress := strings.Split(nodeURI, "//")[1]
@@ -148,6 +160,20 @@ func (te *TestEnvironment) NewEthClient(nodeURI string) ethclient.Client {
 	return client
 }
 
+// Create a new private network that is not shared with other tests.
+func (te *TestEnvironment) NewPrivateNetwork() testnet.Network {
+	// Load the shared network to retrieve its path and exec path
+	sharedNetwork, err := local.ReadNetwork(te.NetworkDir)
+	te.require.NoError(err)
+
+	// The private networks dir is under the shared network dir to ensure it
+	// will be included in the artifact uploaded in CI.
+	privateNetworksDir := filepath.Join(sharedNetwork.Dir, PrivateNetworksDirName)
+	te.require.NoError(os.MkdirAll(privateNetworksDir, perms.ReadWriteExecute))
+
+	return StartLocalNetwork(sharedNetwork.ExecPath, privateNetworksDir)
+}
+
 // Helper simplifying use of a timed context by canceling the context on ginkgo teardown.
 func ContextWithTimeout(duration time.Duration) context.Context {
 	ctx, cancel := context.WithTimeout(context.Background(), duration)
@@ -267,3 +293,32 @@ func CheckBootstrapIsPossible(network testnet.Network) {
 	node := AddEphemeralNode(network, testnet.FlagsMap{})
 	WaitForHealthy(node)
 }
+
+// Start a local test-managed network with the provided avalanchego binary.
+func StartLocalNetwork(avalancheGoExecPath string, networkDir string) *local.LocalNetwork {
+	require := require.New(ginkgo.GinkgoT())
+
+	tests.Outf("{{magenta}}Starting network with %q{{/}}\n", avalancheGoExecPath)
+
+	network, err := local.StartNetwork(
+		DefaultContext(),
+		ginkgo.GinkgoWriter,
+		networkDir,
+		&local.LocalNetwork{
+			LocalConfig: local.LocalConfig{
+				ExecPath: avalancheGoExecPath,
+			},
+		},
+		testnet.DefaultNodeCount,
+		testnet.DefaultFundedKeyCount,
+	)
+	require.NoError(err)
+	ginkgo.DeferCleanup(func() {
+		tests.Outf("Shutting down network\n")
+		require.NoError(network.Stop())
+	})
+
+	tests.Outf("{{green}}Successfully started network{{/}}\n")
+
+	return network
+}

tests/e2e/e2e_test.go

@@ -4,7 +4,6 @@
 package e2e_test
 
 import (
-	"context"
 	"encoding/json"
 	"flag"
 	"fmt"
@@ -20,7 +19,6 @@ import (
 	"github.com/ava-labs/avalanchego/tests"
 	"github.com/ava-labs/avalanchego/tests/e2e"
 	"github.com/ava-labs/avalanchego/tests/fixture"
-	"github.com/ava-labs/avalanchego/tests/fixture/testnet"
 	"github.com/ava-labs/avalanchego/tests/fixture/testnet/local"
 
 	// ensure test packages are scanned by ginkgo
@@ -83,30 +81,7 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
 		network, err = local.ReadNetwork(persistentNetworkDir)
 		require.NoError(err)
 	} else {
-		tests.Outf("{{magenta}}Starting network with %q{{/}}\n", avalancheGoExecPath)
-
-		ctx, cancel := context.WithTimeout(context.Background(), local.DefaultNetworkStartTimeout)
-		defer cancel()
-		var err error
-		network, err = local.StartNetwork(
-			ctx,
-			ginkgo.GinkgoWriter,
-			"", // Use the default path to ensure a predictable target for github's upload-artifact action
-			&local.LocalNetwork{
-				LocalConfig: local.LocalConfig{
-					ExecPath: avalancheGoExecPath,
-				},
-			},
-			testnet.DefaultNodeCount,
-			testnet.DefaultFundedKeyCount,
-		)
-		require.NoError(err)
-		ginkgo.DeferCleanup(func() {
-			tests.Outf("Shutting down network\n")
-			require.NoError(network.Stop())
-		})
-
-		tests.Outf("{{green}}Successfully started network{{/}}\n")
+		network = e2e.StartLocalNetwork(avalancheGoExecPath, e2e.DefaultNetworkDir)
 	}
 
 	uris := network.GetURIs()