Merge pull request #639 from ava-labs/simplify-local-network-struct

Simplify local network struct
ava-labs · Nov 13, 2024 · fa9d24a · fa9d24a
2 parents df7a170 + e9c4f76
commit fa9d24a
Show file tree

Hide file tree

Showing 12 changed files with 271 additions and 548 deletions.
diff --git a/tests/flows/governance/validator_set_sig.go b/tests/flows/governance/validator_set_sig.go
@@ -150,7 +150,7 @@ func ValidatorSetSig(network *localnetwork.LocalNetwork) {
 	// ************************************************************************************************
 
 	// Execute the ValidatorSetSig executeCall and wait for acceptance
-	receipt := network.ExecuteValidatorSetSigCallAndVerify(
+	receipt := utils.ExecuteValidatorSetSigCallAndVerify(
 		ctx,
 		subnetB,
 		subnetA,
@@ -172,7 +172,7 @@ func ValidatorSetSig(network *localnetwork.LocalNetwork) {
 
 	// Resend the same message again and it should fail due to nonce being consumed
 
-	_ = network.ExecuteValidatorSetSigCallAndVerify(
+	_ = utils.ExecuteValidatorSetSigCallAndVerify(
 		ctx,
 		subnetB,
 		subnetA,
@@ -188,7 +188,7 @@ func ValidatorSetSig(network *localnetwork.LocalNetwork) {
 	Expect(endingBalance).Should(Equal(big.NewInt(100)))
 
 	// Send another valid transaction with the incremented nonce
-	receipt2 := network.ExecuteValidatorSetSigCallAndVerify(
+	receipt2 := utils.ExecuteValidatorSetSigCallAndVerify(
 		ctx,
 		subnetB,
 		subnetA,
@@ -219,7 +219,7 @@ func ValidatorSetSig(network *localnetwork.LocalNetwork) {
 
 	// Send the third transaction where the validatorSetSig contract expects validator signatures
 	// from the same chain that it is deployed on.
-	receipt3 := network.ExecuteValidatorSetSigCallAndVerify(
+	receipt3 := utils.ExecuteValidatorSetSigCallAndVerify(
 		ctx,
 		subnetB,
 		subnetB,

diff --git a/tests/flows/ictt/erc20_home_erc20_remote.go b/tests/flows/ictt/erc20_home_erc20_remote.go
@@ -9,7 +9,6 @@ import (
 	erc20tokenremote "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenRemote/ERC20TokenRemote"
 	localnetwork "github.com/ava-labs/teleporter/tests/network"
 	"github.com/ava-labs/teleporter/tests/utils"
-	teleporterUtils "github.com/ava-labs/teleporter/tests/utils"
 	"github.com/ethereum/go-ethereum/crypto"
 	. "github.com/onsi/gomega"
 )
@@ -135,7 +134,7 @@ func ERC20TokenHomeERC20TokenRemote(network *localnetwork.LocalNetwork, teleport
 
 	// Transfer back to home chain
 	// Fund recipient with gas tokens on subnet A
-	teleporterUtils.SendNativeTransfer(
+	utils.SendNativeTransfer(
 		ctx,
 		subnetAInfo,
 		fundedKey,
@@ -158,7 +157,7 @@ func ERC20TokenHomeERC20TokenRemote(network *localnetwork.LocalNetwork, teleport
 		erc20TokenRemote,
 		erc20TokenRemoteAddress,
 		inputB,
-		teleporterUtils.BigIntSub(transferredAmount, inputB.PrimaryFee),
+		utils.BigIntSub(transferredAmount, inputB.PrimaryFee),
 		recipientKey,
 	)
 

diff --git a/tests/flows/ictt/native_home_erc20_remote.go b/tests/flows/ictt/native_home_erc20_remote.go
@@ -9,7 +9,6 @@ import (
 	erc20tokenremote "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenRemote/ERC20TokenRemote"
 	localnetwork "github.com/ava-labs/teleporter/tests/network"
 	"github.com/ava-labs/teleporter/tests/utils"
-	teleporterUtils "github.com/ava-labs/teleporter/tests/utils"
 	"github.com/ethereum/go-ethereum/crypto"
 	. "github.com/onsi/gomega"
 )
@@ -131,7 +130,7 @@ func NativeTokenHomeERC20TokenRemote(network *localnetwork.LocalNetwork, telepor
 	Expect(balance).Should(Equal(transferredAmount))
 
 	// Fund recipient with gas tokens on subnet A
-	teleporterUtils.SendNativeTransfer(
+	utils.SendNativeTransfer(
 		ctx,
 		subnetAInfo,
 		fundedKey,
@@ -155,7 +154,7 @@ func NativeTokenHomeERC20TokenRemote(network *localnetwork.LocalNetwork, telepor
 		erc20TokenRemote,
 		erc20TokenRemoteAddress,
 		inputA,
-		teleporterUtils.BigIntSub(transferredAmount, inputA.PrimaryFee),
+		utils.BigIntSub(transferredAmount, inputA.PrimaryFee),
 		recipientKey,
 	)
 
@@ -177,5 +176,5 @@ func NativeTokenHomeERC20TokenRemote(network *localnetwork.LocalNetwork, telepor
 		transferredAmount,
 	)
 
-	teleporterUtils.CheckBalance(ctx, recipientAddress, transferredAmount, cChainInfo.RPCClient)
+	utils.CheckBalance(ctx, recipientAddress, transferredAmount, cChainInfo.RPCClient)
 }
diff --git a/tests/flows/ictt/native_home_erc20_remote_multihop.go b/tests/flows/ictt/native_home_erc20_remote_multihop.go
@@ -8,7 +8,6 @@ import (
 	nativetokenhome "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenHome/NativeTokenHome"
 	localnetwork "github.com/ava-labs/teleporter/tests/network"
 	"github.com/ava-labs/teleporter/tests/utils"
-	teleporterUtils "github.com/ava-labs/teleporter/tests/utils"
 	"github.com/ethereum/go-ethereum/crypto"
 
 	. "github.com/onsi/gomega"
@@ -128,7 +127,7 @@ func NativeTokenHomeERC20TokenRemoteMultiHop(network *localnetwork.LocalNetwork,
 		nativeTokenHomeAddress,
 		wavax,
 		input,
-		teleporterUtils.BigIntSub(amount, input.PrimaryFee),
+		utils.BigIntSub(amount, input.PrimaryFee),
 		fundedKey,
 	)
 

diff --git a/tests/flows/ictt/transparent_proxy_upgradeability.go b/tests/flows/ictt/transparent_proxy_upgradeability.go
@@ -10,7 +10,6 @@ import (
 	erc20tokenremote "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenRemote/ERC20TokenRemote"
 	localnetwork "github.com/ava-labs/teleporter/tests/network"
 	"github.com/ava-labs/teleporter/tests/utils"
-	teleporterUtils "github.com/ava-labs/teleporter/tests/utils"
 	"github.com/ethereum/go-ethereum/crypto"
 	. "github.com/onsi/gomega"
 )
@@ -60,7 +59,7 @@ func TransparentUpgradeableProxy(network *localnetwork.LocalNetwork, teleporter
 		uint8(1),
 	)
 	Expect(err).Should(BeNil())
-	teleporterUtils.WaitForTransactionSuccess(ctx, cChainInfo, tx.Hash())
+	utils.WaitForTransactionSuccess(ctx, cChainInfo, tx.Hash())
 
 	// Deploy a TransparentUpgradeableProxy contract on primary network for the ERC20TokenHome logic contract
 	erc20TokenHomeAddress, proxyAdmin, erc20TokenHome := utils.DeployTransparentUpgradeableProxy(
@@ -80,7 +79,7 @@ func TransparentUpgradeableProxy(network *localnetwork.LocalNetwork, teleporter
 		tokenDecimals,
 	)
 	Expect(err).Should(BeNil())
-	teleporterUtils.WaitForTransactionSuccess(ctx, cChainInfo, tx.Hash())
+	utils.WaitForTransactionSuccess(ctx, cChainInfo, tx.Hash())
 
 	// Deploy the ERC20TokenRemote contract on Subnet A
 	erc20TokenRemoteAddress, erc20TokenRemote := utils.DeployERC20TokenRemote(
@@ -165,15 +164,15 @@ func TransparentUpgradeableProxy(network *localnetwork.LocalNetwork, teleporter
 		uint8(1),
 	)
 	Expect(err).Should(BeNil())
-	teleporterUtils.WaitForTransactionSuccess(ctx, cChainInfo, tx.Hash())
+	utils.WaitForTransactionSuccess(ctx, cChainInfo, tx.Hash())
 
 	// Upgrade the TransparentUpgradeableProxy contract to use the new logic contract
 	tx, err = proxyAdmin.UpgradeAndCall(opts, erc20TokenHomeAddress, newLogic, []byte{})
 	Expect(err).Should(BeNil())
-	teleporterUtils.WaitForTransactionSuccess(ctx, cChainInfo, tx.Hash())
+	utils.WaitForTransactionSuccess(ctx, cChainInfo, tx.Hash())
 
 	// Send a transfer from Subnet A back to primary network
-	teleporterUtils.SendNativeTransfer(
+	utils.SendNativeTransfer(
 		ctx,
 		subnetAInfo,
 		fundedKey,
@@ -196,7 +195,7 @@ func TransparentUpgradeableProxy(network *localnetwork.LocalNetwork, teleporter
 		erc20TokenRemote,
 		erc20TokenRemoteAddress,
 		inputB,
-		teleporterUtils.BigIntSub(transferredAmount, inputB.PrimaryFee),
+		utils.BigIntSub(transferredAmount, inputB.PrimaryFee),
 		recipientKey,
 	)
 

diff --git a/tests/flows/teleporter/basic_send_receive.go b/tests/flows/teleporter/basic_send_receive.go
@@ -25,7 +25,7 @@ func BasicSendReceive(network *localnetwork.LocalNetwork, teleporter utils.Telep
 	// Clear the receipt queue from Subnet B -> Subnet A to have a clean slate for the test flow.
 	// This is only done if the test non-external networks because external networks may have
 	// an arbitrarily high number of receipts to be cleared from a given queue from unrelated messages.
-	network.ClearReceiptQueue(ctx, teleporter, fundedKey, subnetBInfo, subnetAInfo)
+	teleporter.ClearReceiptQueue(ctx, fundedKey, subnetBInfo, subnetAInfo)
 
 	feeAmount := big.NewInt(1)
 	feeTokenAddress, feeToken := utils.DeployExampleERC20(

diff --git a/tests/flows/teleporter/registry/pause_teleporter.go b/tests/flows/teleporter/registry/pause_teleporter.go
@@ -51,9 +51,8 @@ func PauseTeleporter(network *localnetwork.LocalNetwork, teleporter utils.Telepo
 	Expect(isPaused).Should(BeTrue())
 
 	// Send a message from subnet A to subnet B, which should fail
-	network.SendExampleCrossChainMessageAndVerify(
+	teleporter.SendExampleCrossChainMessageAndVerify(
 		ctx,
-		teleporter,
 		subnetAInfo,
 		testMessengerA,
 		subnetBInfo,
@@ -78,9 +77,8 @@ func PauseTeleporter(network *localnetwork.LocalNetwork, teleporter utils.Telepo
 	Expect(isPaused).Should(BeFalse())
 
 	// Send a message from subnet A to subnet B again, which should now succeed
-	network.SendExampleCrossChainMessageAndVerify(
+	teleporter.SendExampleCrossChainMessageAndVerify(
 		ctx,
-		teleporter,
 		subnetAInfo,
 		testMessengerA,
 		subnetBInfo,

diff --git a/tests/flows/teleporter/registry/teleporter_registry.go b/tests/flows/teleporter/registry/teleporter_registry.go
@@ -52,7 +52,7 @@ func TeleporterRegistry(network *localnetwork.LocalNetwork, teleporter utils.Tel
 	// Deploy the new version of Teleporter to both chains
 	var newTeleporterAddress common.Address
 	for _, subnet := range network.GetAllSubnetsInfo() {
-		newTeleporterAddress = utils.DeployNewTeleporterVersion(ctx, teleporter, subnet, fundedKey, teleporterByteCodeFile)
+		newTeleporterAddress = teleporter.DeployNewTeleporterVersion(ctx, subnet, fundedKey, teleporterByteCodeFile)
 	}
 
 	networkID := network.GetNetworkID()
@@ -92,9 +92,8 @@ func TeleporterRegistry(network *localnetwork.LocalNetwork, teleporter utils.Tel
 	network.RestartNodes(restartCtx, nil)
 
 	// Call addProtocolVersion on subnetB to register the new Teleporter version
-	network.AddProtocolVersionAndWaitForAcceptance(
+	teleporter.AddProtocolVersionAndWaitForAcceptance(
 		ctx,
-		teleporter,
 		subnetBInfo,
 		newTeleporterAddress,
 		fundedKey,
@@ -103,9 +102,8 @@ func TeleporterRegistry(network *localnetwork.LocalNetwork, teleporter utils.Tel
 
 	// Send a message using old Teleporter version to test messenger using new Teleporter version.
 	// Message should be received successfully since we haven't updated mininum Teleporter version yet.
-	network.SendExampleCrossChainMessageAndVerify(
+	teleporter.SendExampleCrossChainMessageAndVerify(
 		ctx,
-		teleporter,
 		cChainInfo,
 		testMessengerC,
 		subnetBInfo,
@@ -140,9 +138,8 @@ func TeleporterRegistry(network *localnetwork.LocalNetwork, teleporter utils.Tel
 
 	// Send a message using old Teleporter version to test messenger with updated minimum Teleporter version.
 	// Message should fail since we updated minimum Teleporter version.
-	network.SendExampleCrossChainMessageAndVerify(
+	teleporter.SendExampleCrossChainMessageAndVerify(
 		ctx,
-		teleporter,
 		cChainInfo,
 		testMessengerC,
 		subnetBInfo,
@@ -159,9 +156,8 @@ func TeleporterRegistry(network *localnetwork.LocalNetwork, teleporter utils.Tel
 		teleporter.InitializeBlockchainID(subnet, fundedKey)
 	}
 
-	network.SendExampleCrossChainMessageAndVerify(
+	teleporter.SendExampleCrossChainMessageAndVerify(
 		ctx,
-		teleporter,
 		subnetBInfo,
 		testMessengerB,
 		cChainInfo,
@@ -173,9 +169,8 @@ func TeleporterRegistry(network *localnetwork.LocalNetwork, teleporter utils.Tel
 	)
 
 	// Call addProtocolVersion on subnetA to register the new Teleporter version
-	network.AddProtocolVersionAndWaitForAcceptance(
+	teleporter.AddProtocolVersionAndWaitForAcceptance(
 		ctx,
-		teleporter,
 		cChainInfo,
 		newTeleporterAddress,
 		fundedKey,
@@ -184,9 +179,8 @@ func TeleporterRegistry(network *localnetwork.LocalNetwork, teleporter utils.Tel
 
 	// Send a message from A->B, which previously failed, but now using the new Teleporter version.
 	// Teleporter versions should match, so message should be received successfully.
-	network.SendExampleCrossChainMessageAndVerify(
+	teleporter.SendExampleCrossChainMessageAndVerify(
 		ctx,
-		teleporter,
 		subnetBInfo,
 		testMessengerB,
 		cChainInfo,
@@ -199,9 +193,8 @@ func TeleporterRegistry(network *localnetwork.LocalNetwork, teleporter utils.Tel
 
 	// To make sure all subnets are using the same Teleporter version, call addProtocolVersion on subnetA
 	// to register the new Teleporter version
-	network.AddProtocolVersionAndWaitForAcceptance(
+	teleporter.AddProtocolVersionAndWaitForAcceptance(
 		ctx,
-		teleporter,
 		subnetAInfo,
 		newTeleporterAddress,
 		fundedKey,

diff --git a/tests/flows/teleporter/send_specific_receipts.go b/tests/flows/teleporter/send_specific_receipts.go
@@ -27,7 +27,7 @@ func SendSpecificReceipts(network *localnetwork.LocalNetwork, teleporter utils.T
 	ctx := context.Background()
 
 	// Clear the receipt queue from Subnet B -> Subnet A to have a clean slate for the test flow.
-	network.ClearReceiptQueue(ctx, teleporter, fundedKey, subnetBInfo, subnetAInfo)
+	teleporter.ClearReceiptQueue(ctx, fundedKey, subnetBInfo, subnetAInfo)
 
 	// Use mock token as the fee token
 	mockTokenAddress, mockToken := utils.DeployExampleERC20(

diff --git a/tests/interfaces/subnet_test_info.go b/tests/interfaces/subnet_test_info.go
@@ -9,7 +9,6 @@ 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