fixup: Cleanup log configuration for load and warp testing

ava-labs · Mar 26, 2024 · c507aa6 · c507aa6
1 parent 6ec90ba
commit c507aa6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/tests/load/load_test.go b/tests/load/load_test.go
@@ -19,7 +19,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/log"
 
-	"github.com/ava-labs/avalanchego/config"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/tests/fixture/e2e"
 	"github.com/ava-labs/avalanchego/tests/fixture/tmpnet"
@@ -59,22 +58,15 @@ var _ = ginkgo.Describe("[Load Simulator]", ginkgo.Ordered, func() {
 	ginkgo.BeforeAll(func() {
 		genesisPath := filepath.Join(repoRootPath, "tests/load/genesis/genesis.json")
 
-		// The load tests are flaky at high levels of evm logging, so leave it at
-		// the default level instead of raising it to debug (as the warp testing does).
-		chainConfig := tmpnet.FlagsMap{}
-
 		nodes := utils.NewTmpnetNodes(nodeCount)
 
 		env = e2e.NewTestEnvironment(
 			flagVars,
 			utils.NewTmpnetNetwork(
 				"subnet-evm-small-load",
 				nodes,
-				tmpnet.FlagsMap{
-					// The default tmpnet log level (debug) induces too much overhead for load testing.
-					config.LogLevelKey: "info",
-				},
-				utils.NewTmpnetSubnet(subnetAName, genesisPath, chainConfig, nodes...),
+				tmpnet.FlagsMap{},
+				utils.NewTmpnetSubnet(subnetAName, genesisPath, utils.DefaultChainConfig, nodes...),
 			),
 		)
 	})

diff --git a/tests/utils/tmpnet.go b/tests/utils/tmpnet.go
@@ -14,6 +14,11 @@ import (
 	"github.com/ava-labs/subnet-evm/plugin/evm"
 )
 
+var DefaultChainConfig = tmpnet.FlagsMap{
+	"log-level":        "debug",
+	"warp-api-enabled": true,
+}
+
 func NewTmpnetNodes(count int) []*tmpnet.Node {
 	nodes := make([]*tmpnet.Node, count)
 	for i := range nodes {
@@ -28,8 +33,6 @@ func NewTmpnetNetwork(owner string, nodes []*tmpnet.Node, flags tmpnet.FlagsMap,
 	defaultFlags := tmpnet.FlagsMap{}
 	defaultFlags.SetDefaults(flags)
 	defaultFlags.SetDefaults(tmpnet.FlagsMap{
-		// Remove when vendored tmpnet default is `off`. tmpnet nodes are run headless so stdout logging is unnecessary.
-		config.LogDisplayLevelKey:            "off",
 		config.ProposerVMUseCurrentHeightKey: true,
 	})
 	return &tmpnet.Network{

diff --git a/tests/warp/warp_test.go b/tests/warp/warp_test.go
@@ -94,11 +94,6 @@ func TestE2E(t *testing.T) {
 var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
 	// Run only once in the first ginkgo process
 
-	chainConfig := tmpnet.FlagsMap{
-		"log-level":        "debug",
-		"warp-api-enabled": true,
-	}
-
 	nodes := utils.NewTmpnetNodes(tmpnet.DefaultNodeCount)
 
 	env := e2e.NewTestEnvironment(
@@ -107,8 +102,8 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
 			"subnet-evm-warp-e2e",
 			nodes,
 			tmpnet.FlagsMap{},
-			utils.NewTmpnetSubnet(subnetAName, genesisPath, chainConfig, nodes...),
-			utils.NewTmpnetSubnet(subnetBName, genesisPath, chainConfig, nodes...),
+			utils.NewTmpnetSubnet(subnetAName, genesisPath, utils.DefaultChainConfig, nodes...),
+			utils.NewTmpnetSubnet(subnetBName, genesisPath, utils.DefaultChainConfig, nodes...),
 		),
 	)