Tokens have been renamed testFlowERC20ToERC721

rainlanguage · Aug 11, 2024 · 6d701be · 6d701be
2 parents 9986a94 + bc907d0
commit 6d701be
Showing 1 changed file with 18 additions and 23 deletions.
diff --git a/test/concrete/flowBasic/FlowTest.sol b/test/concrete/flowBasic/FlowTest.sol
@@ -10,21 +10,16 @@ import {REVERTING_MOCK_BYTECODE} from "test/abstract/TestConstants.sol";
 import {EvaluableConfigV3, SignedContextV1} from "rain.interpreter.interface/interface/IInterpreterCallerV2.sol";
 
 contract FlowTest is FlowBasicTest {
-    address internal immutable iERC721;
-    address internal immutable iERC1155;
-    address internal immutable iIERC20;
+    address internal immutable iTokenA;
+    address internal immutable iTokenB;
 
     constructor() {
         vm.pauseGasMetering();
-        iERC721 = address(uint160(uint256(keccak256("erc721.test"))));
-        vm.etch(address(iERC721), REVERTING_MOCK_BYTECODE);
+        iTokenA = address(uint160(uint256(keccak256("tokenA.test"))));
+        vm.etch(address(iTokenA), REVERTING_MOCK_BYTECODE);
 
-        iERC1155 = address(uint160(uint256(keccak256("erc1155.test"))));
-        vm.etch(address(iERC1155), REVERTING_MOCK_BYTECODE);
-        vm.resumeGasMetering();
-
-        iIERC20 = address(uint160(uint256(keccak256("erc20.test"))));
-        vm.etch(address(iIERC20), REVERTING_MOCK_BYTECODE);
+        iTokenB = address(uint160(uint256(keccak256("tokenB.test"))));
+        vm.etch(address(iTokenB), REVERTING_MOCK_BYTECODE);
         vm.resumeGasMetering();
     }
 
@@ -46,32 +41,32 @@ contract FlowTest is FlowBasicTest {
 
         ERC721Transfer[] memory erc721Transfers = new ERC721Transfer[](1);
         erc721Transfers[0] =
-            ERC721Transfer({token: address(iERC721), from: alice, to: address(flow), id: erc721InTokenId});
+            ERC721Transfer({token: address(iTokenA), from: alice, to: address(flow), id: erc721InTokenId});
 
         ERC1155Transfer[] memory erc1155Transfers = new ERC1155Transfer[](1);
         erc1155Transfers[0] = ERC1155Transfer({
-            token: address(iERC1155),
+            token: address(iTokenB),
             from: address(flow),
             to: alice,
             id: erc1155OutTokenId,
             amount: erc1155OutAmmount
         });
 
-        vm.mockCall(iERC1155, abi.encodeWithSelector(IERC1155.safeTransferFrom.selector), abi.encode());
+        vm.mockCall(iTokenB, abi.encodeWithSelector(IERC1155.safeTransferFrom.selector), abi.encode());
         vm.expectCall(
-            iERC1155,
+            iTokenB,
             abi.encodeWithSelector(
                 IERC1155.safeTransferFrom.selector, flow, alice, erc1155OutTokenId, erc1155OutAmmount, ""
             )
         );
 
         vm.mockCall(
-            iERC721,
+            iTokenA,
             abi.encodeWithSelector(bytes4(keccak256("safeTransferFrom(address,address,uint256)"))),
             abi.encode()
         );
         vm.expectCall(
-            iERC721,
+            iTokenA,
             abi.encodeWithSelector(
                 bytes4(keccak256("safeTransferFrom(address,address,uint256)")), alice, flow, erc721InTokenId
             )
@@ -97,21 +92,21 @@ contract FlowTest is FlowBasicTest {
 
         ERC20Transfer[] memory erc20Transfers = new ERC20Transfer[](1);
         erc20Transfers[0] =
-            ERC20Transfer({token: address(iIERC20), from: bob, to: address(flow), amount: erc20InAmount});
+            ERC20Transfer({token: address(iTokenA), from: bob, to: address(flow), amount: erc20InAmount});
 
         ERC721Transfer[] memory erc721Transfers = new ERC721Transfer[](1);
-        erc721Transfers[0] = ERC721Transfer({token: iERC721, from: address(flow), to: bob, id: erc721OutTokenId});
+        erc721Transfers[0] = ERC721Transfer({token: iTokenB, from: address(flow), to: bob, id: erc721OutTokenId});
 
-        vm.mockCall(iIERC20, abi.encodeWithSelector(IERC20.transferFrom.selector), abi.encode(true));
-        vm.expectCall(iIERC20, abi.encodeWithSelector(IERC20.transferFrom.selector, bob, flow, erc20InAmount));
+        vm.mockCall(iTokenA, abi.encodeWithSelector(IERC20.transferFrom.selector), abi.encode(true));
+        vm.expectCall(iTokenA, abi.encodeWithSelector(IERC20.transferFrom.selector, bob, flow, erc20InAmount));
 
         vm.mockCall(
-            iERC721,
+            iTokenB,
             abi.encodeWithSelector(bytes4(keccak256("safeTransferFrom(address,address,uint256)"))),
             abi.encode()
         );
         vm.expectCall(
-            iERC721,
+            iTokenB,
             abi.encodeWithSelector(
                 bytes4(keccak256("safeTransferFrom(address,address,uint256)")), flow, bob, erc721OutTokenId
             )