From 3b65c906b522fd0549d9ed3699cf81de2c982b44 Mon Sep 17 00:00:00 2001 From: William Banfield Date: Tue, 14 Jun 2022 14:10:28 -0400 Subject: [PATCH] use random seed to power node generator --- test/e2e/pkg/testnet.go | 4 ++-- test/e2e/runner/main.go | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/e2e/pkg/testnet.go b/test/e2e/pkg/testnet.go index 147c451f9..6458ecd3f 100644 --- a/test/e2e/pkg/testnet.go +++ b/test/e2e/pkg/testnet.go @@ -106,7 +106,7 @@ type Node struct { // The testnet generation must be deterministic, since it is generated // separately by the runner and the test cases. For this reason, testnets use a // random seed to generate e.g. keys. -func LoadTestnet(file string) (*Testnet, error) { +func LoadTestnet(file string, seed int64) (*Testnet, error) { manifest, err := LoadManifest(file) if err != nil { return nil, err @@ -124,7 +124,7 @@ func LoadTestnet(file string) (*Testnet, error) { } ipGen := newIPGenerator(ipNet) - keyGen := newKeyGenerator(randomSeed) + keyGen := newKeyGenerator(seed) proxyPortGen := newPortGenerator(proxyPortFirst) testnet := &Testnet{ diff --git a/test/e2e/runner/main.go b/test/e2e/runner/main.go index e4c04259c..4025c99dd 100644 --- a/test/e2e/runner/main.go +++ b/test/e2e/runner/main.go @@ -53,12 +53,14 @@ func NewCLI(logger log.Logger) *CLI { // If flag is absent, no error is returned, but the default value (empty string) return err } + cli.seedDelta, err = cmd.Flags().GetInt("seed-delta") + seed := randomSeed + cli.seedDelta // nolint: gosec if len(ips) == 0 { file, err := cmd.Flags().GetString("file") if err != nil { return err } - testnet, err := e2e.LoadTestnet(file) + testnet, err := e2e.LoadTestnet(file, int64(seed)) if err != nil { return err } @@ -66,7 +68,6 @@ func NewCLI(logger log.Logger) *CLI { return nil } cli.ips = strings.Split(ips, ",") - cli.seedDelta, err = cmd.Flags().GetInt("seed-delta") if err != nil { // If flag is absent, no error is returned, but the default value (empty string) return err