Merge pull request #429 from ava-labs/tmpnet-deferrals

Tmpnet deferrals
ava-labs · Jul 19, 2024 · c6c6117 · c6c6117
2 parents 3b82c10 + 4afe45b
commit c6c6117
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/tests/interfaces/subnet_test_info.go b/tests/interfaces/subnet_test_info.go
@@ -12,6 +12,7 @@ import (
 
 // Tracks information about a test subnet used for executing tests against.
 type SubnetTestInfo struct {
+	SubnetName          string
 	SubnetID            ids.ID
 	BlockchainID        ids.ID
 	NodeURIs            []string

diff --git a/tests/local/e2e_test.go b/tests/local/e2e_test.go
@@ -81,8 +81,8 @@ var _ = ginkgo.BeforeSuite(func() {
 	log.Info("Set up ginkgo before suite")
 
 	ginkgo.AddReportEntry(
-		"network directory with has node logs & configs; useful in the case of failures",
-		LocalNetworkInstance.Dir(),
+		"network directory with node logs & configs; useful in the case of failures",
+		LocalNetworkInstance.tmpnet.Dir,
 		ginkgo.ReportEntryVisibilityFailureOrVerbose,
 	)
 })

diff --git a/tests/local/network.go b/tests/local/network.go
@@ -160,8 +160,9 @@ func (n *LocalNetwork) setPrimaryNetworkValues() {
 	// Get the C-Chain node URIs.
 	// All subnet nodes validate the C-Chain, so we can include them all here
 	var nodeURIs []string
-	nodeURIs = append(nodeURIs, n.subnetsInfo[n.tmpnet.GetSubnet("A").SubnetID].NodeURIs...)
-	nodeURIs = append(nodeURIs, n.subnetsInfo[n.tmpnet.GetSubnet("B").SubnetID].NodeURIs...)
+	for _, subnetInfo := range n.subnetsInfo {
+		nodeURIs = append(nodeURIs, subnetInfo.NodeURIs...)
+	}
 	for _, extraNode := range n.extraNodes {
 		uri, err := n.tmpnet.GetURIForNodeID(extraNode.NodeID)
 		Expect(err).Should(BeNil())
@@ -231,6 +232,7 @@ func (n *LocalNetwork) setSubnetValues(subnet *tmpnet.Subnet) {
 	if n.subnetsInfo[subnetID] == nil {
 		n.subnetsInfo[subnetID] = &interfaces.SubnetTestInfo{}
 	}
+	n.subnetsInfo[subnetID].SubnetName = subnet.Name
 	n.subnetsInfo[subnetID].SubnetID = subnetID
 	n.subnetsInfo[subnetID].BlockchainID = blockchainID
 	n.subnetsInfo[subnetID].NodeURIs = chainNodeURIs
@@ -336,10 +338,11 @@ func (n *LocalNetwork) DeployTeleporterRegistryContracts(
 }
 
 func (n *LocalNetwork) GetSubnetsInfo() []interfaces.SubnetTestInfo {
-	return []interfaces.SubnetTestInfo{
-		*n.subnetsInfo[n.tmpnet.GetSubnet("A").SubnetID],
-		*n.subnetsInfo[n.tmpnet.GetSubnet("B").SubnetID],
+	subnetsInfo := make([]interfaces.SubnetTestInfo, 0, len(n.subnetsInfo))
+	for _, subnetInfo := range n.subnetsInfo {
+		subnetsInfo = append(subnetsInfo, *subnetInfo)
 	}
+	return subnetsInfo
 }
 
 func (n *LocalNetwork) GetPrimaryNetworkInfo() interfaces.SubnetTestInfo {
@@ -430,8 +433,11 @@ func (n *LocalNetwork) setAllSubnetValues() {
 	subnetIDs := n.GetSubnetsInfo()
 	Expect(len(subnetIDs)).Should(Equal(2))
 
-	n.setSubnetValues(n.tmpnet.GetSubnet("A"))
-	n.setSubnetValues(n.tmpnet.GetSubnet("B"))
+	for _, subnetInfo := range n.subnetsInfo {
+		subnet := n.tmpnet.GetSubnet(subnetInfo.SubnetName)
+		Expect(subnet).ShouldNot(BeNil())
+		n.setSubnetValues(n.tmpnet.GetSubnet(subnetInfo.SubnetName))
+	}
 
 	n.setPrimaryNetworkValues()
 }

diff --git a/tests/utils/utils.go b/tests/utils/utils.go
@@ -1205,7 +1205,7 @@ func InstantiateGenesisTemplate(
 
 	var replaced string = string(templateFileBytes[:])
 	for _, s := range substitutions {
-		replaced = strings.Replace(replaced, s.Target, s.Value, 1)
+		replaced = strings.ReplaceAll(replaced, s.Target, s.Value)
 	}
 
 	subnetGenesisFile.WriteString(replaced)