From af0cddeb98db4e819307e2830a5aefcb959aa502 Mon Sep 17 00:00:00 2001 From: "F. Eugene Aumson" Date: Fri, 12 Jul 2024 11:20:00 -0400 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Michael Kaplan <55204436+michaelkaplan13@users.noreply.github.com> Signed-off-by: F. Eugene Aumson --- tests/flows/teleporter_registry.go | 3 +-- tests/local/network.go | 4 ++-- tests/utils/utils.go | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/flows/teleporter_registry.go b/tests/flows/teleporter_registry.go index 96ad2a413..edd1a0d24 100644 --- a/tests/flows/teleporter_registry.go +++ b/tests/flows/teleporter_registry.go @@ -75,9 +75,8 @@ func TeleporterRegistry(network interfaces.LocalNetwork) { chainConfigs.Add(subnetAInfo, warpEnabledChainConfigA) // Restart nodes with new chain config - nodeIDs := network.GetAllNodeIDs() network.SetChainConfigs(chainConfigs) - network.RestartNodes(ctx, nodeIDs) + network.RestartNodes(ctx, network.GetAllNodeIDs()) // Call addProtocolVersion on subnetB to register the new Teleporter version utils.AddProtocolVersionAndWaitForAcceptance( diff --git a/tests/local/network.go b/tests/local/network.go index d54cdf471..0890a5500 100644 --- a/tests/local/network.go +++ b/tests/local/network.go @@ -81,7 +81,7 @@ func NewLocalNetwork( ctx := context.Background() var err error - // declare some extra nodes to be used to add more validators later: + // Create extra nodes to be used to add more validators later extraNodes := subnetEvmTestUtils.NewTmpnetNodes(extraNodeCount) f, err := os.CreateTemp(os.TempDir(), "config.json") @@ -537,7 +537,7 @@ func (n *LocalNetwork) RestartNodes(ctx context.Context, nodeIDs []ids.NodeID) { } func (n *LocalNetwork) SetChainConfigs(chainConfigs map[string]string) { - for chainIdStr, chainConfig := range chainConfigs { + for chainIDStr, chainConfig := range chainConfigs { if chainIdStr == utils.CChainPathSpecifier { var cfg tmpnet.FlagsMap err := json.Unmarshal([]byte(chainConfig), &cfg) diff --git a/tests/utils/utils.go b/tests/utils/utils.go index 3b65edd7d..f8a8d7881 100644 --- a/tests/utils/utils.go +++ b/tests/utils/utils.go @@ -1205,8 +1205,7 @@ func InstantiateGenesisTemplate( scanner := bufio.NewScanner(templateFile) for scanner.Scan() { - var replaced string - replaced = scanner.Text() + replaced := scanner.Text() for _, s := range substitutions { replaced = strings.Replace(replaced, s.Target, s.Value, 1) }