[e2] Run e2e with debug mode logs (#317)

* run e2e with debug mode logs * fix config load during e2e * update tokenvm * increase sleep for stae sync
ava-labs · Aug 1, 2023 · 0f0793c · 0f0793c
1 parent 8e00cca
commit 0f0793c
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 6 deletions.
diff --git a/examples/morpheusvm/config/config.go b/examples/morpheusvm/config/config.go
@@ -57,6 +57,7 @@ type Config struct {
 	// State Sync
 	StateSyncServerDelay time.Duration `json:"stateSyncServerDelay"` // for testing
 
+	loaded             bool
 	nodeID             ids.NodeID
 	parsedExemptPayers [][]byte
 }
@@ -68,6 +69,7 @@ func New(nodeID ids.NodeID, b []byte) (*Config, error) {
 		if err := json.Unmarshal(b, c); err != nil {
 			return nil, fmt.Errorf("failed to unmarshal config %s: %w", string(b), err)
 		}
+		c.loaded = true
 	}
 
 	// Parse any exempt payers (usually used when a single account is
@@ -127,3 +129,4 @@ func (c *Config) GetContinuousProfilerConfig() *profiler.Config {
 }
 func (c *Config) GetVerifySignatures() bool  { return c.VerifySignatures }
 func (c *Config) GetStoreTransactions() bool { return c.StoreTransactions }
+func (c *Config) Loaded() bool               { return c.loaded }
diff --git a/examples/morpheusvm/controller/controller.go b/examples/morpheusvm/controller/controller.go
@@ -83,7 +83,7 @@ func (c *Controller) Initialize(
 		return nil, nil, nil, nil, nil, nil, nil, nil, nil, err
 	}
 	c.snowCtx.Log.SetLevel(c.config.GetLogLevel())
-	snowCtx.Log.Info("loaded config", zap.Any("contents", c.config))
+	snowCtx.Log.Info("initialized config", zap.Bool("loaded", c.config.Loaded()), zap.Any("contents", c.config))
 
 	c.genesis, err = genesis.New(genesisBytes, upgradeBytes)
 	if err != nil {

diff --git a/examples/morpheusvm/scripts/run.sh b/examples/morpheusvm/scripts/run.sh
@@ -20,11 +20,11 @@ fi
 VERSION=6e97e33e06422ef6e03a765729aaa90eb26d01a5
 MODE=${MODE:-run}
 LOGLEVEL=${LOGLEVEL:-info}
-AVALANCHE_LOG_LEVEL=${AVALANCHE_LOG_LEVEL:-INFO}
 STATESYNC_DELAY=${STATESYNC_DELAY:-0}
 MIN_BLOCK_GAP=${MIN_BLOCK_GAP:-100}
 if [[ ${MODE} != "run" ]]; then
-  STATESYNC_DELAY=50000000 # 50ms
+  LOGLEVEL=debug
+  STATESYNC_DELAY=100000000 # 100ms
   MIN_BLOCK_GAP=250 #ms
 fi
 

diff --git a/examples/morpheusvm/tests/e2e/e2e_test.go b/examples/morpheusvm/tests/e2e/e2e_test.go
@@ -7,6 +7,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"os"
 	"testing"
 	"time"
 
@@ -52,6 +53,7 @@ var (
 
 	vmGenesisPath    string
 	vmConfigPath     string
+	vmConfig         string
 	subnetConfigPath string
 	outputPath       string
 
@@ -187,6 +189,15 @@ var _ = ginkgo.BeforeSuite(func() {
 		consts.ID,
 	)
 
+	// Load config data
+	if len(vmConfigPath) > 0 {
+		configData, err := os.ReadFile(vmConfigPath)
+		gomega.Expect(err).Should(gomega.BeNil())
+		vmConfig = string(configData)
+	} else {
+		vmConfig = "{}"
+	}
+
 	// Start cluster
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
 	resp, err := anrCli.Start(
@@ -472,6 +483,9 @@ var _ = ginkgo.Describe("[Test]", func() {
 			"bootstrap",
 			execPath,
 			trackSubnetsOpt,
+			runner_sdk.WithChainConfigs(map[string]string{
+				blockchainID: vmConfig,
+			}),
 		)
 		gomega.Expect(err).To(gomega.BeNil())
 		awaitHealthy(anrCli, []instance{instances[0]})
@@ -513,6 +527,9 @@ var _ = ginkgo.Describe("[Test]", func() {
 			"sync",
 			execPath,
 			trackSubnetsOpt,
+			runner_sdk.WithChainConfigs(map[string]string{
+				blockchainID: vmConfig,
+			}),
 		)
 		gomega.Expect(err).To(gomega.BeNil())
 
@@ -585,6 +602,9 @@ var _ = ginkgo.Describe("[Test]", func() {
 			"sync_concurrent",
 			execPath,
 			trackSubnetsOpt,
+			runner_sdk.WithChainConfigs(map[string]string{
+				blockchainID: vmConfig,
+			}),
 		)
 		gomega.Expect(err).To(gomega.BeNil())
 		awaitHealthy(anrCli, []instance{instances[0]})

diff --git a/examples/tokenvm/config/config.go b/examples/tokenvm/config/config.go
@@ -73,6 +73,7 @@ type Config struct {
 	// State Sync
 	StateSyncServerDelay time.Duration `json:"stateSyncServerDelay"` // for testing
 
+	loaded             bool
 	nodeID             ids.NodeID
 	parsedExemptPayers [][]byte
 }
@@ -84,6 +85,7 @@ func New(nodeID ids.NodeID, b []byte) (*Config, error) {
 		if err := json.Unmarshal(b, c); err != nil {
 			return nil, fmt.Errorf("failed to unmarshal config %s: %w", string(b), err)
 		}
+		c.loaded = true
 	}
 
 	// Parse any exempt payers (usually used when a single account is
@@ -150,3 +152,4 @@ func (c *Config) GetContinuousProfilerConfig() *profiler.Config {
 }
 func (c *Config) GetVerifySignatures() bool  { return c.VerifySignatures }
 func (c *Config) GetStoreTransactions() bool { return c.StoreTransactions }
+func (c *Config) Loaded() bool               { return c.loaded }
diff --git a/examples/tokenvm/controller/controller.go b/examples/tokenvm/controller/controller.go
@@ -87,7 +87,7 @@ func (c *Controller) Initialize(
 		return nil, nil, nil, nil, nil, nil, nil, nil, nil, err
 	}
 	c.snowCtx.Log.SetLevel(c.config.GetLogLevel())
-	snowCtx.Log.Info("loaded config", zap.Any("contents", c.config))
+	snowCtx.Log.Info("initialized config", zap.Bool("loaded", c.config.Loaded()), zap.Any("contents", c.config))
 
 	c.genesis, err = genesis.New(genesisBytes, upgradeBytes)
 	if err != nil {

diff --git a/examples/tokenvm/scripts/run.sh b/examples/tokenvm/scripts/run.sh
@@ -20,11 +20,11 @@ fi
 VERSION=6e97e33e06422ef6e03a765729aaa90eb26d01a5
 MODE=${MODE:-run}
 LOGLEVEL=${LOGLEVEL:-info}
-AVALANCHE_LOG_LEVEL=${AVALANCHE_LOG_LEVEL:-INFO}
 STATESYNC_DELAY=${STATESYNC_DELAY:-0}
 MIN_BLOCK_GAP=${MIN_BLOCK_GAP:-100}
 if [[ ${MODE} != "run" && ${MODE} != "run-single" ]]; then
-  STATESYNC_DELAY=50000000 # 50ms
+  LOGLEVEL=debug
+  STATESYNC_DELAY=100000000 # 100ms
   MIN_BLOCK_GAP=250 #ms
 fi
 

diff --git a/examples/tokenvm/tests/e2e/e2e_test.go b/examples/tokenvm/tests/e2e/e2e_test.go
@@ -7,6 +7,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"os"
 	"testing"
 	"time"
 
@@ -53,6 +54,7 @@ var (
 
 	vmGenesisPath    string
 	vmConfigPath     string
+	vmConfig         string
 	subnetConfigPath string
 	outputPath       string
 
@@ -181,6 +183,15 @@ var _ = ginkgo.BeforeSuite(func() {
 		consts.ID,
 	)
 
+	// Load config data
+	if len(vmConfigPath) > 0 {
+		configData, err := os.ReadFile(vmConfigPath)
+		gomega.Expect(err).Should(gomega.BeNil())
+		vmConfig = string(configData)
+	} else {
+		vmConfig = "{}"
+	}
+
 	// Start cluster
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
 	resp, err := anrCli.Start(
@@ -1331,6 +1342,9 @@ var _ = ginkgo.Describe("[Test]", func() {
 			"bootstrap",
 			execPath,
 			trackSubnetsOpt,
+			runner_sdk.WithChainConfigs(map[string]string{
+				blockchainIDA: vmConfig,
+			}),
 		)
 		gomega.Expect(err).To(gomega.BeNil())
 		awaitHealthy(anrCli, []instance{instancesA[0]})
@@ -1372,6 +1386,9 @@ var _ = ginkgo.Describe("[Test]", func() {
 			"sync",
 			execPath,
 			trackSubnetsOpt,
+			runner_sdk.WithChainConfigs(map[string]string{
+				blockchainIDA: vmConfig,
+			}),
 		)
 		gomega.Expect(err).To(gomega.BeNil())
 
@@ -1444,6 +1461,9 @@ var _ = ginkgo.Describe("[Test]", func() {
 			"sync_concurrent",
 			execPath,
 			trackSubnetsOpt,
+			runner_sdk.WithChainConfigs(map[string]string{
+				blockchainIDA: vmConfig,
+			}),
 		)
 		gomega.Expect(err).To(gomega.BeNil())
 		awaitHealthy(anrCli, []instance{instancesA[0]})