Rename network

tests/e2e_test.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/ava-labs/teleporter/tests/flows"
-	"github.com/ava-labs/teleporter/tests/network"
+	localnetwork "github.com/ava-labs/teleporter/tests/network"
 	deploymentUtils "github.com/ava-labs/teleporter/utils/deployment-utils"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/onsi/ginkgo/v2"
@@ -27,9 +27,7 @@ const (
 	validatorSetSigLabel     = "ValidatorSetSig"
 )
 
-var (
-	LocalNetworkInstance *network.LocalNetwork
-)
+var LocalNetworkInstance *localnetwork.LocalNetwork
 
 func TestE2E(t *testing.T) {
 	if os.Getenv("RUN_E2E") == "" {
@@ -43,22 +41,25 @@ func TestE2E(t *testing.T) {
 // Define the Teleporter before and after suite functions.
 var _ = ginkgo.BeforeSuite(func() {
 	// Generate the Teleporter deployment values
-	teleporterDeployerTransaction, teleporterDeployedBytecode, teleporterDeployerAddress, teleporterContractAddress, err :=
-		deploymentUtils.ConstructKeylessTransaction(
-			teleporterByteCodeFile,
-			false,
-			deploymentUtils.GetDefaultContractCreationGasPrice(),
-		)
+	teleporterDeployerTransaction,
+		teleporterDeployedBytecode,
+		teleporterDeployerAddress,
+		teleporterContractAddress,
+		err := deploymentUtils.ConstructKeylessTransaction(
+		teleporterByteCodeFile,
+		false,
+		deploymentUtils.GetDefaultContractCreationGasPrice(),
+	)
 	Expect(err).Should(BeNil())
 
 	// Create the local network instance
 	ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second)
 	defer cancel()
-	LocalNetworkInstance = network.NewLocalNetwork(
+	LocalNetworkInstance = localnetwork.NewLocalNetwork(
 		ctx,
 		"teleporter-test-local-network",
 		warpGenesisTemplateFile,
-		[]network.SubnetSpec{
+		[]localnetwork.SubnetSpec{
 			{
 				Name:                       "A",
 				EVMChainID:                 12345,

tests/flows/add_fee_amount.go

@@ -6,17 +6,17 @@ import (
 
 	"github.com/ava-labs/subnet-evm/accounts/abi/bind"
 	teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger"
-	"github.com/ava-labs/teleporter/tests/network"
+	localnetwork "github.com/ava-labs/teleporter/tests/network"
 	"github.com/ava-labs/teleporter/tests/utils"
 	"github.com/ethereum/go-ethereum/common"
 	. "github.com/onsi/gomega"
 )
 
-func AddFeeAmount(n *network.LocalNetwork) {
-	subnetAInfo := n.GetPrimaryNetworkInfo()
-	subnetBInfo, _ := n.GetTwoSubnets()
-	teleporterContractAddress := n.GetTeleporterContractAddress()
-	fundedAddress, fundedKey := n.GetFundedAccountInfo()
+func AddFeeAmount(network *localnetwork.LocalNetwork) {
+	subnetAInfo := network.GetPrimaryNetworkInfo()
+	subnetBInfo, _ := network.GetTwoSubnets()
+	teleporterContractAddress := network.GetTeleporterContractAddress()
+	fundedAddress, fundedKey := network.GetFundedAccountInfo()
 	ctx := context.Background()
 
 	// Use mock token as the fee token
@@ -66,7 +66,7 @@ func AddFeeAmount(n *network.LocalNetwork) {
 	)
 
 	// Relay message from Subnet A to Subnet B
-	deliveryReceipt := n.RelayMessage(ctx, sendCrossChainMsgReceipt, subnetAInfo, subnetBInfo, true)
+	deliveryReceipt := network.RelayMessage(ctx, sendCrossChainMsgReceipt, subnetAInfo, subnetBInfo, true)
 	receiveEvent, err := utils.GetEventFromLogs(
 		deliveryReceipt.Logs,
 		subnetBInfo.TeleporterMessenger.ParseReceiveCrossChainMessage)
@@ -98,7 +98,7 @@ func AddFeeAmount(n *network.LocalNetwork) {
 		fundedKey)
 
 	// Relay message containing the specific receipt from Subnet B to Subnet A
-	n.RelayMessage(ctx, sendSpecificReceiptsReceipt, subnetBInfo, subnetAInfo, true)
+	network.RelayMessage(ctx, sendSpecificReceiptsReceipt, subnetBInfo, subnetAInfo, true)
 
 	// Check message delivered
 	delivered, err = subnetAInfo.TeleporterMessenger.MessageReceived(&bind.CallOpts{}, sendSpecificReceiptsMessageID)

tests/flows/basic_send_receive.go

@@ -6,28 +6,26 @@ import (
 
 	"github.com/ava-labs/subnet-evm/accounts/abi/bind"
 	teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger"
-	"github.com/ava-labs/teleporter/tests/network"
+	localnetwork "github.com/ava-labs/teleporter/tests/network"
 	"github.com/ava-labs/teleporter/tests/utils"
 	"github.com/ethereum/go-ethereum/common"
 	. "github.com/onsi/gomega"
 )
 
 // Tests basic one-way send from Subnet A to Subnet B and vice versa
-func BasicSendReceive(n *network.LocalNetwork) {
-	subnetAInfo := n.GetPrimaryNetworkInfo()
-	subnetBInfo, _ := n.GetTwoSubnets()
-	teleporterContractAddress := n.GetTeleporterContractAddress()
-	fundedAddress, fundedKey := n.GetFundedAccountInfo()
+func BasicSendReceive(network *localnetwork.LocalNetwork) {
+	subnetAInfo := network.GetPrimaryNetworkInfo()
+	subnetBInfo, _ := network.GetTwoSubnets()
+	teleporterContractAddress := network.GetTeleporterContractAddress()
+	fundedAddress, fundedKey := network.GetFundedAccountInfo()
 
 	// Send a transaction to Subnet A to issue a Warp Message from the Teleporter contract to Subnet B
 	ctx := context.Background()
 
 	// 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.
-	if !n.IsExternalNetwork() {
-		network.ClearReceiptQueue(ctx, n, fundedKey, subnetBInfo, subnetAInfo)
-	}
+	network.ClearReceiptQueue(ctx, fundedKey, subnetBInfo, subnetAInfo)
 
 	feeAmount := big.NewInt(1)
 	feeTokenAddress, feeToken := utils.DeployExampleERC20(
@@ -67,7 +65,7 @@ func BasicSendReceive(n *network.LocalNetwork) {
 	expectedReceiptID := teleporterMessageID
 
 	// Relay the message to the destination
-	deliveryReceipt := n.RelayMessage(ctx, receipt, subnetAInfo, subnetBInfo, true)
+	deliveryReceipt := network.RelayMessage(ctx, receipt, subnetAInfo, subnetBInfo, true)
 	receiveEvent, err := utils.GetEventFromLogs(
 		deliveryReceipt.Logs,
 		subnetBInfo.TeleporterMessenger.ParseReceiveCrossChainMessage)
@@ -92,17 +90,12 @@ func BasicSendReceive(n *network.LocalNetwork) {
 	)
 
 	// Relay the message to the destination
-	deliveryReceipt = n.RelayMessage(ctx, receipt, subnetBInfo, subnetAInfo, true)
+	deliveryReceipt = network.RelayMessage(ctx, receipt, subnetBInfo, subnetAInfo, true)
 
-	// Check that the receipt was received for expected Teleporter message ID
-	// This check is not performed for external networks because the specific receipt for this message
-	// may not have been included if the receipt queue had an existing build up of more than 5 messages.
-	if !n.IsExternalNetwork() {
-		Expect(utils.CheckReceiptReceived(
-			deliveryReceipt,
-			expectedReceiptID,
-			subnetAInfo.TeleporterMessenger)).Should(BeTrue())
-	}
+	Expect(utils.CheckReceiptReceived(
+		deliveryReceipt,
+		expectedReceiptID,
+		subnetAInfo.TeleporterMessenger)).Should(BeTrue())
 
 	// Check Teleporter message received on the destination
 	delivered, err = subnetAInfo.TeleporterMessenger.MessageReceived(
@@ -112,9 +105,8 @@ func BasicSendReceive(n *network.LocalNetwork) {
 	Expect(delivered).Should(BeTrue())
 
 	// If the reward address of the message from A->B is the funded address, which is able to send
-	// transactions on subnet A, then redeem the rewards. This check is not performed for external
-	// networks since the specific receipt may not have been included in the message, as noted above.
-	if !n.IsExternalNetwork() && receiveEvent.RewardRedeemer == fundedAddress {
+	// transactions on subnet A, then redeem the rewards.
+	if receiveEvent.RewardRedeemer == fundedAddress {
 		utils.RedeemRelayerRewardsAndConfirm(
 			ctx, subnetAInfo, feeToken, feeTokenAddress, fundedKey, feeAmount,
 		)

tests/flows/check_upgrade_access.go

@@ -5,21 +5,21 @@ import (
 	"math/big"
 
 	"github.com/ava-labs/subnet-evm/accounts/abi/bind"
-	"github.com/ava-labs/teleporter/tests/network"
+	localnetwork "github.com/ava-labs/teleporter/tests/network"
 	"github.com/ava-labs/teleporter/tests/utils"
 	"github.com/ethereum/go-ethereum/crypto"
 	. "github.com/onsi/gomega"
 )
 
-func CheckUpgradeAccess(n *network.LocalNetwork) {
-	subnetInfo := n.GetPrimaryNetworkInfo()
-	fundedAddress, fundedKey := n.GetFundedAccountInfo()
+func CheckUpgradeAccess(network *localnetwork.LocalNetwork) {
+	subnetInfo := network.GetPrimaryNetworkInfo()
+	fundedAddress, fundedKey := network.GetFundedAccountInfo()
 
 	//
 	// Deploy TestMessenger to the subnet
 	//
 	ctx := context.Background()
-	teleporterAddress := n.GetTeleporterContractAddress()
+	teleporterAddress := network.GetTeleporterContractAddress()
 	_, testMessenger := utils.DeployTestMessenger(
 		ctx,
 		fundedKey,

tests/flows/deliver_to_nonexistent_contract.go

@@ -6,18 +6,18 @@ import (
 
 	"github.com/ava-labs/subnet-evm/accounts/abi/bind"
 	testmessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/tests/TestMessenger"
-	"github.com/ava-labs/teleporter/tests/network"
+	localnetwork "github.com/ava-labs/teleporter/tests/network"
 	"github.com/ava-labs/teleporter/tests/utils"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/log"
 	. "github.com/onsi/gomega"
 )
 
-func DeliverToNonExistentContract(n *network.LocalNetwork) {
-	subnetAInfo := n.GetPrimaryNetworkInfo()
-	subnetBInfo, _ := n.GetTwoSubnets()
-	fundedAddress, fundedKey := n.GetFundedAccountInfo()
+func DeliverToNonExistentContract(network *localnetwork.LocalNetwork) {
+	subnetAInfo := network.GetPrimaryNetworkInfo()
+	subnetBInfo, _ := network.GetTwoSubnets()
+	fundedAddress, fundedKey := network.GetFundedAccountInfo()
 
 	deployerKey, err := crypto.GenerateKey()
 	Expect(err).Should(BeNil())
@@ -84,7 +84,7 @@ func DeliverToNonExistentContract(n *network.LocalNetwork) {
 	// Relay the message to the destination
 	//
 	log.Info("Relaying the message to the destination")
-	receipt = n.RelayMessage(ctx, receipt, subnetAInfo, subnetBInfo, true)
+	receipt = network.RelayMessage(ctx, receipt, subnetAInfo, subnetBInfo, true)
 	receiveEvent, err := utils.GetEventFromLogs(
 		receipt.Logs,
 		subnetAInfo.TeleporterMessenger.ParseReceiveCrossChainMessage,

tests/flows/deliver_to_wrong_chain.go

@@ -6,17 +6,17 @@ import (
 
 	"github.com/ava-labs/subnet-evm/accounts/abi/bind"
 	teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger"
-	"github.com/ava-labs/teleporter/tests/network"
+	localnetwork "github.com/ava-labs/teleporter/tests/network"
 	"github.com/ava-labs/teleporter/tests/utils"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
 	. "github.com/onsi/gomega"
 )
 
-func DeliverToWrongChain(n *network.LocalNetwork) {
-	subnetAInfo := n.GetPrimaryNetworkInfo()
-	subnetBInfo, subnetCInfo := n.GetTwoSubnets()
-	fundedAddress, fundedKey := n.GetFundedAccountInfo()
+func DeliverToWrongChain(network *localnetwork.LocalNetwork) {
+	subnetAInfo := network.GetPrimaryNetworkInfo()
+	subnetBInfo, subnetCInfo := network.GetTwoSubnets()
+	fundedAddress, fundedKey := network.GetFundedAccountInfo()
 
 	//
 	// Get the expected teleporter message ID for Subnet C
@@ -56,7 +56,7 @@ func DeliverToWrongChain(n *network.LocalNetwork) {
 		fundedKey,
 	)
 
-	n.RelayMessage(ctx, receipt, subnetAInfo, subnetCInfo, false)
+	network.RelayMessage(ctx, receipt, subnetAInfo, subnetCInfo, false)
 
 	//
 	// Check that the message was not received on the Subnet C

tests/flows/insufficient_gas.go

@@ -5,15 +5,15 @@ import (
 	"math/big"
 
 	"github.com/ava-labs/subnet-evm/accounts/abi/bind"
-	"github.com/ava-labs/teleporter/tests/network"
+	localnetwork "github.com/ava-labs/teleporter/tests/network"
 	"github.com/ava-labs/teleporter/tests/utils"
 	. "github.com/onsi/gomega"
 )
 
-func InsufficientGas(n *network.LocalNetwork) {
-	subnetAInfo := n.GetPrimaryNetworkInfo()
-	subnetBInfo, _ := n.GetTwoSubnets()
-	fundedAddress, fundedKey := n.GetFundedAccountInfo()
+func InsufficientGas(network *localnetwork.LocalNetwork) {
+	subnetAInfo := network.GetPrimaryNetworkInfo()
+	subnetBInfo, _ := network.GetTwoSubnets()
+	fundedAddress, fundedKey := network.GetFundedAccountInfo()
 	ctx := context.Background()
 
 	// Deploy TestMessenger to Subnets A
@@ -51,7 +51,7 @@ func InsufficientGas(n *network.LocalNetwork) {
 	messageID := event.MessageID
 
 	// Relay message from SubnetA to SubnetB
-	receipt = n.RelayMessage(ctx, receipt, subnetAInfo, subnetBInfo, true)
+	receipt = network.RelayMessage(ctx, receipt, subnetAInfo, subnetBInfo, true)
 
 	// Check Teleporter message received on the destination
 	delivered, err := subnetBInfo.TeleporterMessenger.MessageReceived(&bind.CallOpts{}, messageID)

tests/flows/pause_teleporter.go

@@ -4,21 +4,21 @@ import (
 	"context"
 
 	"github.com/ava-labs/subnet-evm/accounts/abi/bind"
-	"github.com/ava-labs/teleporter/tests/network"
+	localnetwork "github.com/ava-labs/teleporter/tests/network"
 	"github.com/ava-labs/teleporter/tests/utils"
 	. "github.com/onsi/gomega"
 )
 
-func PauseTeleporter(n *network.LocalNetwork) {
-	subnetAInfo := n.GetPrimaryNetworkInfo()
-	subnetBInfo, _ := n.GetTwoSubnets()
-	fundedAddress, fundedKey := n.GetFundedAccountInfo()
+func PauseTeleporter(network *localnetwork.LocalNetwork) {
+	subnetAInfo := network.GetPrimaryNetworkInfo()
+	subnetBInfo, _ := network.GetTwoSubnets()
+	fundedAddress, fundedKey := network.GetFundedAccountInfo()
 
 	//
 	// Deploy TestMessenger to Subnets A and B
 	//
 	ctx := context.Background()
-	teleporterAddress := n.GetTeleporterContractAddress()
+	teleporterAddress := network.GetTeleporterContractAddress()
 	_, testMessengerA := utils.DeployTestMessenger(
 		ctx,
 		fundedKey,
@@ -51,7 +51,6 @@ func PauseTeleporter(n *network.LocalNetwork) {
 	// Send a message from subnet A to subnet B, which should fail
 	network.SendExampleCrossChainMessageAndVerify(
 		ctx,
-		n,
 		subnetAInfo,
 		testMessengerA,
 		subnetBInfo,
@@ -78,7 +77,6 @@ func PauseTeleporter(n *network.LocalNetwork) {
 	// Send a message from subnet A to subnet B again, which should now succeed
 	network.SendExampleCrossChainMessageAndVerify(
 		ctx,
-		n,
 		subnetAInfo,
 		testMessengerA,
 		subnetBInfo,

tests/flows/relay_message_twice.go

@@ -6,18 +6,18 @@ import (
 
 	"github.com/ava-labs/subnet-evm/accounts/abi/bind"
 	teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger"
-	"github.com/ava-labs/teleporter/tests/network"
+	localnetwork "github.com/ava-labs/teleporter/tests/network"
 	"github.com/ava-labs/teleporter/tests/utils"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
 
 	. "github.com/onsi/gomega"
 )
 
-func RelayMessageTwice(n *network.LocalNetwork) {
-	subnetAInfo := n.GetPrimaryNetworkInfo()
-	subnetBInfo, _ := n.GetTwoSubnets()
-	fundedAddress, fundedKey := n.GetFundedAccountInfo()
+func RelayMessageTwice(network *localnetwork.LocalNetwork) {
+	subnetAInfo := network.GetPrimaryNetworkInfo()
+	subnetBInfo, _ := network.GetTwoSubnets()
+	fundedAddress, fundedKey := network.GetFundedAccountInfo()
 
 	//
 	// Send a transaction to Subnet A to issue a Warp Message from the Teleporter contract to Subnet B
@@ -47,7 +47,7 @@ func RelayMessageTwice(n *network.LocalNetwork) {
 	//
 	// Relay the message to the destination
 	//
-	n.RelayMessage(ctx, receipt, subnetAInfo, subnetBInfo, true)
+	network.RelayMessage(ctx, receipt, subnetAInfo, subnetBInfo, true)
 
 	//
 	// Check Teleporter message received on the destination
@@ -63,5 +63,5 @@ func RelayMessageTwice(n *network.LocalNetwork) {
 	// Attempt to send the same message again, should fail
 	//
 	log.Info("Relaying the same Teleporter message again on the destination")
-	n.RelayMessage(ctx, receipt, subnetAInfo, subnetBInfo, false)
+	network.RelayMessage(ctx, receipt, subnetAInfo, subnetBInfo, false)
 }