clean up utility params

ava-labs · Apr 10, 2024 · 49ee09a · 49ee09a
1 parent 0bc3d47
commit 49ee09a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/tests/flows/erc20_source_native_destination_multihop.go b/tests/flows/erc20_source_native_destination_multihop.go
@@ -205,7 +205,7 @@ func ERC20SourceNativeDestinationMultihop(network interfaces.Network) {
 		ctx,
 		network,
 		fundedKey,
-		recipientKey,
+		recipientAddress,
 		subnetAInfo,
 		nativeTokenDestinationA,
 		subnetBInfo,
@@ -225,7 +225,7 @@ func ERC20SourceNativeDestinationMultihop(network interfaces.Network) {
 		ctx,
 		network,
 		fundedKey,
-		recipientKey,
+		recipientAddress,
 		subnetBInfo,
 		nativeTokenDestinationB,
 		subnetAInfo,

diff --git a/tests/flows/native_source_native_destination_multihop.go b/tests/flows/native_source_native_destination_multihop.go
@@ -201,7 +201,7 @@ func NativeSourceNativeDestinationMultihop(network interfaces.Network) {
 		ctx,
 		network,
 		fundedKey,
-		recipientKey,
+		recipientAddress,
 		subnetAInfo,
 		nativeTokenDestinationA,
 		subnetBInfo,
@@ -221,7 +221,7 @@ func NativeSourceNativeDestinationMultihop(network interfaces.Network) {
 		ctx,
 		network,
 		fundedKey,
-		recipientKey,
+		recipientAddress,
 		subnetBInfo,
 		nativeTokenDestinationB,
 		subnetAInfo,

diff --git a/tests/utils/utils.go b/tests/utils/utils.go
@@ -359,8 +359,8 @@ func SendERC20Destination(
 func SendNativeMultihopAndVerify(
 	ctx context.Context,
 	network interfaces.Network,
-	fundedKey *ecdsa.PrivateKey,
-	recipientKey *ecdsa.PrivateKey,
+	sendingKey *ecdsa.PrivateKey,
+	recipientAddress common.Address,
 	fromSubnet interfaces.SubnetTestInfo,
 	fromBridge *nativetokendestination.NativeTokenDestination,
 	toSubnet interfaces.SubnetTestInfo,
@@ -371,14 +371,6 @@ func SendNativeMultihopAndVerify(
 	tokenMultiplier *big.Int,
 	multiplyOnReceive bool,
 ) {
-	recipientAddress := crypto.PubkeyToAddress(recipientKey.PublicKey)
-	teleporterUtils.SendNativeTransfer(
-		ctx,
-		fromSubnet,
-		fundedKey,
-		recipientAddress,
-		big.NewInt(1e18),
-	)
 	input := nativetokendestination.SendTokensInput{
 		DestinationBlockchainID:  toSubnet.BlockchainID,
 		DestinationBridgeAddress: toBridgeAddress,
@@ -397,7 +389,7 @@ func SendNativeMultihopAndVerify(
 		fromBridge,
 		input,
 		bridgedAmount,
-		recipientKey,
+		sendingKey,
 		tokenMultiplier,
 		multiplyOnReceive,
 	)
@@ -436,7 +428,7 @@ func SendERC20MultihopAndVerify(
 	ctx context.Context,
 	network interfaces.Network,
 	fundedKey *ecdsa.PrivateKey,
-	recipientKey *ecdsa.PrivateKey,
+	sendingKey *ecdsa.PrivateKey,
 	recipientAddress common.Address,
 	fromSubnet interfaces.SubnetTestInfo,
 	fromBridge *erc20destination.ERC20Destination,
@@ -471,7 +463,7 @@ func SendERC20MultihopAndVerify(
 		fromBridgeAddress,
 		input,
 		bridgedAmount,
-		recipientKey,
+		sendingKey,
 	)
 
 	// Relay the first message back to the home-chain, in this case C-Chain,