rename Utils methods

onflow · Apr 25, 2024 · 5afa1ea · 5afa1ea
1 parent dc137e1
commit 5afa1ea
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cadence/contracts/bridge/FlowEVMBridge.cdc b/cadence/contracts/bridge/FlowEVMBridge.cdc
@@ -300,7 +300,7 @@ contract FlowEVMBridge : IFlowEVMNFTBridge, IFlowEVMTokenBridge {
         let associatedAddress = FlowEVMBridgeConfig.getEVMAddressAssociated(with: type)
             ?? panic("No EVMAddress found for token type")
         // Execute the transfer call and make needed state assertions to confirm escrow from named owner
-        FlowEVMBridgeUtils.mustExecuteERC721ProtectedTransferCall(
+        FlowEVMBridgeUtils.mustEscrowERC721(
             owner: owner,
             id: id,
             erc721Address: associatedAddress,
@@ -490,7 +490,7 @@ contract FlowEVMBridge : IFlowEVMNFTBridge, IFlowEVMTokenBridge {
 
         /* Execute the transfer call and make needed state assertions */
         //
-        FlowEVMBridgeUtils.mustExecuteProtectedERC20TransferCall(
+        FlowEVMBridgeUtils.mustEscrowERC20(
             owner: owner,
             amount: amount,
             erc20Address: associatedAddress,

diff --git a/cadence/contracts/bridge/FlowEVMBridgeHandlers.cdc b/cadence/contracts/bridge/FlowEVMBridgeHandlers.cdc
@@ -135,7 +135,7 @@ access(all) contract FlowEVMBridgeHandlers {
                     erc20Address: evmAddress
                 )
 
-            FlowEVMBridgeUtils.mustExecuteProtectedERC20TransferCall(
+            FlowEVMBridgeUtils.mustEscrowERC20(
                 owner: owner,
                 amount: amount,
                 erc20Address: evmAddress,

diff --git a/cadence/contracts/bridge/FlowEVMBridgeUtils.cdc b/cadence/contracts/bridge/FlowEVMBridgeUtils.cdc
@@ -851,7 +851,7 @@ contract FlowEVMBridgeUtils {
     /// was successful, and the bridge COA owns the NFT after the protected transfer call.
     ///
     access(account)
-    fun mustExecuteERC721ProtectedTransferCall(
+    fun mustEscrowERC721(
         owner: EVM.EVMAddress,
         id: UInt256,
         erc721Address: EVM.EVMAddress,
@@ -936,7 +936,7 @@ contract FlowEVMBridgeUtils {
     /// escrow balance was incremented by the same amount.
     ///
     access(account)
-    fun mustExecuteProtectedERC20TransferCall(
+    fun mustEscrowERC20(
         owner: EVM.EVMAddress,
         amount: UInt256,
         erc20Address: EVM.EVMAddress,