refactoring naming

rainlanguage · Aug 8, 2024 · 7ebef68 · 7ebef68
1 parent 02b707d
commit 7ebef68
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 3 deletions.
diff --git a/test/abstract/FlowBaseTest.sol → test/abstract/FlowBasicTest.sol b/test/abstract/FlowBaseTest.sol → test/abstract/FlowBasicTest.sol
@@ -16,7 +16,7 @@ import {STUB_EXPRESSION_BYTECODE} from "./TestConstants.sol";
 import {EvaluableV2} from "rain.interpreter.interface/lib/caller/LibEvaluable.sol";
 import {CloneFactory} from "rain.factory/src/concrete/CloneFactory.sol";
 
-abstract contract FlowBaseTest is FlowUtilsAbstractTest, InterpreterMockTest {
+abstract contract FlowTest is FlowUtilsAbstractTest, InterpreterMockTest {
     CloneFactory internal immutable iCloneFactory;
     IFlowV5 internal immutable iFlowImplementation;
 

diff --git a/test/concrete/flow/FlowERC721ToERC1155Test.sol b/test/concrete/flow/FlowERC721ToERC1155Test.sol
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: CAL
 pragma solidity ^0.8.18;
 
-import {FlowBaseTest} from "test/abstract/FlowBaseTest.sol";
+import {FlowTest} from "test/abstract/FlowTest.sol";
 import {IFlowV5, ERC20Transfer, ERC721Transfer, ERC1155Transfer} from "src/interface/unstable/IFlowV5.sol";
 import {EvaluableV2} from "rain.interpreter.interface/lib/caller/LibEvaluable.sol";
 import {IERC1155} from "openzeppelin-contracts/contracts/token/ERC1155/IERC1155.sol";
 import {REVERTING_MOCK_BYTECODE} from "test/abstract/TestConstants.sol";
 
-contract FlowERC721ToERC1155Test is FlowBaseTest {
+contract FlowERC721ToERC1155Test is FlowTest {
     address internal immutable iERC721;
     address internal immutable iERC1155;
 

diff --git a/test/concrete/flowBasic/FlowTest.sol b/test/concrete/flowBasic/FlowTest.sol
@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: CAL
+pragma solidity ^0.8.18;
+
+import {FlowBasicTest} from "test/abstract/FlowBasicTest.sol";
+import {IFlowV5, ERC20Transfer, ERC721Transfer, ERC1155Transfer} from "src/interface/unstable/IFlowV5.sol";
+import {EvaluableV2} from "rain.interpreter.interface/lib/caller/LibEvaluable.sol";
+import {IERC1155} from "openzeppelin-contracts/contracts/token/ERC1155/IERC1155.sol";
+import {REVERTING_MOCK_BYTECODE} from "test/abstract/TestConstants.sol";
+
+contract FlowTest is FlowBasicTest {
+    address internal immutable iERC721;
+    address internal immutable iERC1155;
+
+    constructor() {
+        vm.pauseGasMetering();
+        iERC721 = address(uint160(uint256(keccak256("erc721.test"))));
+        vm.etch(address(iERC721), REVERTING_MOCK_BYTECODE);
+
+        iERC1155 = address(uint160(uint256(keccak256("store.rain.test"))));
+        vm.etch(address(iERC1155), REVERTING_MOCK_BYTECODE);
+        vm.resumeGasMetering();
+    }
+
+    function testFlowERC721ToERC1155(
+        address alice,
+        uint256 erc721InTokenId,
+        uint256 erc1155OutTokenId,
+        uint256 erc1155OutAmmount
+    ) external {
+        vm.assume(alice != address(0));
+        vm.label(alice, "Alice");
+
+        (IFlowV5 flow, EvaluableV2 memory evaluable) = deployFlow();
+
+        ERC721Transfer[] memory erc721Transfers = new ERC721Transfer[](1);
+        erc721Transfers[0] =
+            ERC721Transfer({token: address(iERC721), from: alice, to: address(flow), id: erc721InTokenId});
+
+        ERC1155Transfer[] memory erc1155Transfers = new ERC1155Transfer[](1);
+        erc1155Transfers[0] = ERC1155Transfer({
+            token: address(iERC1155),
+            from: address(flow),
+            to: alice,
+            id: erc1155OutTokenId,
+            amount: erc1155OutAmmount
+        });
+
+        vm.mockCall(
+            iERC1155,
+            abi.encodeWithSelector(
+                IERC1155.safeTransferFrom.selector, flow, alice, erc1155OutTokenId, erc1155OutAmmount, ""
+            ),
+            abi.encode()
+        );
+        vm.expectCall(
+            iERC1155,
+            abi.encodeWithSelector(
+                IERC1155.safeTransferFrom.selector, flow, alice, erc1155OutTokenId, erc1155OutAmmount, ""
+            )
+        );
+
+        vm.mockCall(
+            iERC721,
+            abi.encodeWithSelector(
+                bytes4(keccak256("safeTransferFrom(address,address,uint256)")), alice, flow, erc721InTokenId
+            ),
+            abi.encode()
+        );
+        vm.expectCall(
+            iERC721,
+            abi.encodeWithSelector(
+                bytes4(keccak256("safeTransferFrom(address,address,uint256)")), alice, flow, erc721InTokenId
+            )
+        );
+
+        vm.startPrank(alice);
+        performFlow(flow, evaluable, new ERC20Transfer[](0), erc721Transfers, erc1155Transfers);
+        vm.stopPrank();
+    }
+}