Change e2e tooling to accomodate mulitple network types

tests/flows/governance/validator_set_sig.go

@@ -12,7 +12,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-func ValidatorSetSig(network *localnetwork.LocalNetwork) {
+func ValidatorSetSig(network *localnetwork.LocalAvalancheNetwork) {
 	// ************************************************************************************************
 	// Setup
 	// ************************************************************************************************

tests/flows/ictt/erc20_home_erc20_remote.go

@@ -19,7 +19,7 @@ import (
  * Transfers C-Chain example ERC20 tokens to L1 A
  * Transfer tokens from L1 A to C-Chain
  */
-func ERC20TokenHomeERC20TokenRemote(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func ERC20TokenHomeERC20TokenRemote(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	cChainInfo := network.GetPrimaryNetworkInfo()
 	l1AInfo, _ := network.GetTwoL1s()
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()

tests/flows/ictt/erc20_home_erc20_remote_multihop.go

@@ -19,7 +19,10 @@ import (
  * Transfer tokens from L1 A to L1 B through multi-hop
  * Transfer back tokens from L1 B to L1 A through multi-hop
  */
-func ERC20TokenHomeERC20TokenRemoteMultiHop(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func ERC20TokenHomeERC20TokenRemoteMultiHop(
+	network *localnetwork.LocalAvalancheNetwork,
+	teleporter utils.TeleporterTestInfo,
+) {
 	cChainInfo := network.GetPrimaryNetworkInfo()
 	l1AInfo, l1BInfo := network.GetTwoL1s()
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()

tests/flows/ictt/erc20_home_erc20_remote_send_and_call.go

@@ -21,7 +21,7 @@ import (
  * C-Chain and calls contract on the C-Chain using sendAndCall
  */
 func ERC20TokenHomeERC20TokenRemoteSendAndCall(
-	network *localnetwork.LocalNetwork,
+	network *localnetwork.LocalAvalancheNetwork,
 	teleporter utils.TeleporterTestInfo,
 ) {
 	cChainInfo := network.GetPrimaryNetworkInfo()

tests/flows/ictt/erc20_home_native_remote.go

@@ -31,7 +31,7 @@ var (
  * Transfers C-Chain example ERC20 tokens to L1 A as L1 A's native token
  * Transfer back tokens from L1 A to C-Chain
  */
-func ERC20TokenHomeNativeTokenRemote(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func ERC20TokenHomeNativeTokenRemote(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	cChainInfo := network.GetPrimaryNetworkInfo()
 	l1AInfo, _ := network.GetTwoL1s()
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()

tests/flows/ictt/erc20_home_native_remote_multihop.go

@@ -22,7 +22,10 @@ import (
   - Transfer tokens from L1 A to L1 B through multi-hop
   - Transfer back tokens from L1 B to L1 A through multi-hop
 */
-func ERC20TokenHomeNativeTokenRemoteMultiHop(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func ERC20TokenHomeNativeTokenRemoteMultiHop(
+	network *localnetwork.LocalAvalancheNetwork,
+	teleporter utils.TeleporterTestInfo,
+) {
 	cChainInfo := network.GetPrimaryNetworkInfo()
 	l1AInfo, l1BInfo := network.GetTwoL1s()
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()

tests/flows/ictt/native_home_erc20_remote.go

@@ -19,7 +19,7 @@ import (
  * Transfers C-Chain native tokens to L1 A
  * Transfer back tokens from L1 A to C-Chain
  */
-func NativeTokenHomeERC20TokenRemote(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func NativeTokenHomeERC20TokenRemote(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	cChainInfo := network.GetPrimaryNetworkInfo()
 	l1AInfo, _ := network.GetTwoL1s()
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()

tests/flows/ictt/native_home_erc20_remote_multihop.go

@@ -20,7 +20,10 @@ import (
  * Transfer tokens from L1 A to L1 B through multi-hop
  * Brige back tokens from L1 B to L1 A through multi-hop
  */
-func NativeTokenHomeERC20TokenRemoteMultiHop(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func NativeTokenHomeERC20TokenRemoteMultiHop(
+	network *localnetwork.LocalAvalancheNetwork,
+	teleporter utils.TeleporterTestInfo,
+) {
 	cChainInfo := network.GetPrimaryNetworkInfo()
 	l1AInfo, l1BInfo := network.GetTwoL1s()
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()

tests/flows/ictt/native_home_native_remote.go

@@ -18,7 +18,10 @@ import (
  * Transfers C-Chain native tokens to L1 A
  * Transfer back tokens from L1 A to C-Chain
  */
-func NativeTokenHomeNativeDestination(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func NativeTokenHomeNativeDestination(
+	network *localnetwork.LocalAvalancheNetwork,
+	teleporter utils.TeleporterTestInfo,
+) {
 	cChainInfo := network.GetPrimaryNetworkInfo()
 	l1AInfo, _ := network.GetTwoL1s()
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()

tests/flows/ictt/native_home_native_remote_multihop.go

@@ -21,7 +21,10 @@ import (
   - Transfer tokens from L1 A to L1 B through multi-hop
   - Transfer back tokens from L1 B to L1 A through multi-hop
 */
-func NativeTokenHomeNativeTokenRemoteMultiHop(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func NativeTokenHomeNativeTokenRemoteMultiHop(
+	network *localnetwork.LocalAvalancheNetwork,
+	teleporter utils.TeleporterTestInfo,
+) {
 	cChainInfo := network.GetPrimaryNetworkInfo()
 	l1AInfo, l1BInfo := network.GetTwoL1s()
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()

tests/flows/ictt/registration_and_collateral_check.go

@@ -21,7 +21,7 @@ import (
  * Collateralize the remote
  * Check sending to collateralized remote succeeds and withdraws with correct scale.
  */
-func RegistrationAndCollateralCheck(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func RegistrationAndCollateralCheck(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	cChainInfo := network.GetPrimaryNetworkInfo()
 	l1AInfo, _ := network.GetTwoL1s()
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()

tests/flows/ictt/transparent_proxy_upgradeability.go

@@ -26,7 +26,7 @@ import (
  * Check that the transfer was successful, and expected balances are correct
  */
 
-func TransparentUpgradeableProxy(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func TransparentUpgradeableProxy(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	cChainInfo := network.GetPrimaryNetworkInfo()
 	l1AInfo, _ := network.GetTwoL1s()
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()

tests/flows/teleporter/add_fee_amount.go

@@ -12,7 +12,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-func AddFeeAmount(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func AddFeeAmount(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	l1AInfo := network.GetPrimaryNetworkInfo()
 	l1BInfo, _ := network.GetTwoL1s()
 	teleporterContractAddress := teleporter.TeleporterMessengerAddress(l1AInfo)

tests/flows/teleporter/basic_send_receive.go

@@ -13,7 +13,7 @@ import (
 )
 
 // Tests basic one-way send from L1 A to L1 B and vice versa
-func BasicSendReceive(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func BasicSendReceive(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	l1AInfo := network.GetPrimaryNetworkInfo()
 	l1BInfo, _ := network.GetTwoL1s()
 	teleporterContractAddress := teleporter.TeleporterMessengerAddress(l1AInfo)

tests/flows/teleporter/deliver_to_nonexistent_contract.go

@@ -14,7 +14,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-func DeliverToNonExistentContract(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func DeliverToNonExistentContract(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	l1AInfo := network.GetPrimaryNetworkInfo()
 	l1BInfo, _ := network.GetTwoL1s()
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()

tests/flows/teleporter/deliver_to_wrong_chain.go

@@ -13,7 +13,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-func DeliverToWrongChain(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func DeliverToWrongChain(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	l1AInfo := network.GetPrimaryNetworkInfo()
 	l1BInfo, L1CInfo := network.GetTwoL1s()
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()

tests/flows/teleporter/insufficient_gas.go

@@ -10,7 +10,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-func InsufficientGas(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func InsufficientGas(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	l1AInfo := network.GetPrimaryNetworkInfo()
 	l1BInfo, _ := network.GetTwoL1s()
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()

tests/flows/teleporter/registry/check_upgrade_access.go

@@ -13,7 +13,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-func CheckUpgradeAccess(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func CheckUpgradeAccess(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	l1Info := network.GetPrimaryNetworkInfo()
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()
 

tests/flows/teleporter/registry/pause_teleporter.go

@@ -9,7 +9,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-func PauseTeleporter(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func PauseTeleporter(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	l1AInfo := network.GetPrimaryNetworkInfo()
 	l1BInfo, _ := network.GetTwoL1s()
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()

tests/flows/teleporter/registry/teleporter_registry.go

@@ -14,7 +14,7 @@ const (
 	teleporterByteCodeFile = "./avalanche/out/TeleporterMessenger.sol/TeleporterMessenger.json"
 )
 
-func TeleporterRegistry(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func TeleporterRegistry(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	// Deploy dApp on both chains that use Teleporter Registry
 	// Deploy version 2 of Teleporter to both chains
 	// Construct AddProtocolVersion txs for both chains

tests/flows/teleporter/relay_message_twice.go

@@ -14,7 +14,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-func RelayMessageTwice(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func RelayMessageTwice(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	l1AInfo := network.GetPrimaryNetworkInfo()
 	l1BInfo, _ := network.GetTwoL1s()
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()

tests/flows/teleporter/relayer_modifies_message.go

@@ -23,7 +23,7 @@ import (
 )
 
 // Disallow this test from being run on anything but a local network, since it requires special behavior by the relayer
-func RelayerModifiesMessage(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func RelayerModifiesMessage(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	l1AInfo := network.GetPrimaryNetworkInfo()
 	l1BInfo, _ := network.GetTwoL1s()
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()
@@ -69,7 +69,7 @@ func relayAlteredMessage(
 	sourceReceipt *types.Receipt,
 	source interfaces.L1TestInfo,
 	destination interfaces.L1TestInfo,
-	network *localnetwork.LocalNetwork,
+	network *localnetwork.LocalAvalancheNetwork,
 ) {
 	// Fetch the Teleporter message from the logs
 	sendEvent, err := utils.GetEventFromLogs(

tests/flows/teleporter/resubmit_altered_message.go

@@ -13,7 +13,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-func ResubmitAlteredMessage(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func ResubmitAlteredMessage(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	l1AInfo := network.GetPrimaryNetworkInfo()
 	l1BInfo, _ := network.GetTwoL1s()
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()

tests/flows/teleporter/retry_successful_execution.go

@@ -11,7 +11,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-func RetrySuccessfulExecution(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func RetrySuccessfulExecution(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	l1AInfo := network.GetPrimaryNetworkInfo()
 	l1BInfo, _ := network.GetTwoL1s()
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()

tests/flows/teleporter/send_specific_receipts.go

@@ -18,7 +18,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-func SendSpecificReceipts(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func SendSpecificReceipts(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	l1AInfo := network.GetPrimaryNetworkInfo()
 	l1BInfo, _ := network.GetTwoL1s()
 	l1ATeleporterMessenger := teleporter.TeleporterMessenger(l1AInfo)

tests/flows/teleporter/teleporter_message_ids.go

@@ -16,7 +16,7 @@ import (
 )
 
 // Tests Teleporter message ID calculation
-func CalculateMessageID(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func CalculateMessageID(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	l1Info := network.GetPrimaryNetworkInfo()
 
 	sourceBlockchainID := common.HexToHash("0xabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcd")

tests/flows/teleporter/unallowed_relayer.go

@@ -13,7 +13,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-func UnallowedRelayer(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func UnallowedRelayer(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	l1AInfo := network.GetPrimaryNetworkInfo()
 	l1BInfo, _ := network.GetTwoL1s()
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()

tests/flows/teleporter/validator_churn.go

@@ -21,7 +21,7 @@ const (
 	sleepPeriodSeconds = 5
 )
 
-func ValidatorChurn(network *localnetwork.LocalNetwork, teleporter utils.TeleporterTestInfo) {
+func ValidatorChurn(network *localnetwork.LocalAvalancheNetwork, teleporter utils.TeleporterTestInfo) {
 	l1AInfo, l1BInfo := network.GetTwoL1s()
 	teleporterContractAddress := teleporter.TeleporterMessengerAddress(l1AInfo)
 	fundedAddress, fundedKey := network.GetFundedAccountInfo()

tests/flows/validator-manager/delegator_inactive_validator.go

@@ -25,7 +25,7 @@ import (
  * - Disable the validator by issuing a DisableL1ValidatorTx on the P-Chain
  * - Initiate and complete validator removal
  */
-func RemoveDelegatorInactiveValidator(network *localnetwork.LocalNetwork) {
+func RemoveDelegatorInactiveValidator(network *localnetwork.LocalAvalancheNetwork) {
 	// Get the L1s info
 	cChainInfo := network.GetPrimaryNetworkInfo()
 	l1AInfo, _ := network.GetTwoL1s()

tests/flows/validator-manager/erc20_token_staking.go

@@ -33,7 +33,7 @@ import (
  * - Deliver the Warp message to the L1
  * - Verify that the validator is delisted from the staking contract
  */
-func ERC20TokenStakingManager(network *localnetwork.LocalNetwork) {
+func ERC20TokenStakingManager(network *localnetwork.LocalAvalancheNetwork) {
 	// Get the L1s info
 	cChainInfo := network.GetPrimaryNetworkInfo()
 	l1AInfo, _ := network.GetTwoL1s()

tests/flows/validator-manager/native_token_staking.go

@@ -32,7 +32,7 @@ import (
  * - Deliver the Warp message to the L1
  * - Verify that the validator is delisted from the staking contract
  */
-func NativeTokenStakingManager(network *localnetwork.LocalNetwork) {
+func NativeTokenStakingManager(network *localnetwork.LocalAvalancheNetwork) {
 	// Get the L1s info
 	cChainInfo := network.GetPrimaryNetworkInfo()
 	l1AInfo, _ := network.GetTwoL1s()

tests/flows/validator-manager/poa_to_pos.go

@@ -38,7 +38,7 @@ import (
  * - Delist the previous PoA validator properly
  * - Delist the PoS validator
  */
-func PoAMigrationToPoS(network *localnetwork.LocalNetwork) {
+func PoAMigrationToPoS(network *localnetwork.LocalAvalancheNetwork) {
 	cChainInfo := network.GetPrimaryNetworkInfo()
 	l1AInfo, _ := network.GetTwoL1s()
 	_, fundedKey := network.GetFundedAccountInfo()