Merge branch '2024-09-03-FlowERC721FlowERC721ToERC1155Test' into 2024…

…-09-13-FlowERC1155PreviewDefinedFlowIOForERC20MultiElementArraysTest
rainlanguage · Sep 15, 2024 · 3dcab2f · 3dcab2f
2 parents e8798e8 + 53d308d
commit 3dcab2f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/test/abstract/FlowTransferOperation.sol b/test/abstract/FlowTransferOperation.sol
@@ -40,7 +40,7 @@ abstract contract FlowTransferOperation is Test {
         return FlowTransferV1(new ERC20Transfer[](0), new ERC721Transfer[](0), new ERC1155Transfer[](0));
     }
 
-    function transferRC721ToERC1155(
+    function transferERC721ToERC1155(
         address addressA,
         address addressB,
         uint256 erc721InTokenId,

diff --git a/test/abstract/flow/AbstractFlowTest.sol b/test/abstract/flow/AbstractFlowTest.sol
@@ -27,7 +27,7 @@ contract AbstractFlowTest is FlowBasicTest {
                 20 ether,
                 10 ether,
                 5,
-                transferRC721ToERC1155(alice, flow, erc721InTokenId, erc1155OutAmount, erc1155OutTokenId)
+                transferERC721ToERC1155(alice, flow, erc721InTokenId, erc1155OutAmount, erc1155OutTokenId)
             );
             interpreterEval2MockCall(stack, new uint256[](0));
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ contract AbstractFlowTest is FlowBasicTest { @@
 ether,
 ether,
 ,
-                    transferRC721ToERC1155(alice, flow, erc721InTokenId, erc1155OutAmount, erc1155OutTokenId)
+                    transferERC721ToERC1155(alice, flow, erc721InTokenId, erc1155OutAmount, erc1155OutTokenId)
                 );
                 interpreterEval2MockCall(stack, new uint256[](0));
             }
@@ Expand Down @@