fix: move forge tests

maticnetwork · Sep 18, 2024 · 67e94d6 · 67e94d6
1 parent 945936f
commit 67e94d6
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 42 deletions.
diff --git a/test/forge/child/ChildChainManager.t.sol → forge/child/ChildChainManager.t.sol b/test/forge/child/ChildChainManager.t.sol → forge/child/ChildChainManager.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.6.2;
 pragma experimental ABIEncoderV2;
 
-import "forge-std/Test.sol";
+import "lib/forge-std/src/Test.sol";
 
 import {ChildChainManager} from "contracts/child/ChildChainManager/ChildChainManager.sol";
 import {ChildChainManagerProxy} from "contracts/child/ChildChainManager/ChildChainManagerProxy.sol";

diff --git a/test/forge/predicates/ERC1155Predicate.t.sol → forge/predicates/ERC1155Predicate.t.sol b/test/forge/predicates/ERC1155Predicate.t.sol → forge/predicates/ERC1155Predicate.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.6.2;
 pragma experimental ABIEncoderV2;
 
-import "forge-std/Test.sol";
+import "lib/forge-std/src/Test.sol";
 import {ERC1155Predicate} from "contracts/root/TokenPredicates/ERC1155Predicate.sol";
 import {ERC1155PredicateProxy} from "contracts/root/TokenPredicates/ERC1155PredicateProxy.sol";
 import {DummyERC1155} from "contracts/root/RootToken/DummyERC1155.sol";
@@ -189,7 +189,7 @@ contract ERC1155PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc1155TransferSingle";
         inputs[4] = vm.toString(
             abi.encode(
@@ -220,7 +220,7 @@ contract ERC1155PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc1155TransferSingle";
         inputs[4] = vm.toString(
             abi.encode(
@@ -251,7 +251,7 @@ contract ERC1155PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc1155TransferSingle";
         inputs[4] = vm.toString(
             abi.encode(
@@ -290,7 +290,7 @@ contract ERC1155PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc1155TransferSingle";
         inputs[4] = vm.toString(
             abi.encode(
@@ -349,7 +349,7 @@ contract ERC1155PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc1155TransferBatch";
         inputs[4] = vm.toString(
             abi.encode(

diff --git a/test/forge/predicates/ERC20Predicate.t.sol → forge/predicates/ERC20Predicate.t.sol b/test/forge/predicates/ERC20Predicate.t.sol → forge/predicates/ERC20Predicate.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.6.2;
 pragma experimental ABIEncoderV2;
 
-import "forge-std/Test.sol";
+import "lib/forge-std/src/Test.sol";
 import {ERC20Predicate} from "contracts/root/TokenPredicates/ERC20Predicate.sol";
 import {ERC20PredicateProxy} from "contracts/root/TokenPredicates/ERC20PredicateProxy.sol";
 import {DummyERC20} from "contracts/root/RootToken/DummyERC20.sol";
@@ -154,7 +154,7 @@ contract ERC20PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc20Transfer";
         inputs[4] = vm.toString(
             abi.encode(
@@ -183,7 +183,7 @@ contract ERC20PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc20Transfer";
         inputs[4] = vm.toString(
             abi.encode(
@@ -212,7 +212,7 @@ contract ERC20PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc20Transfer";
         inputs[4] = vm.toString(
             abi.encode(
@@ -244,7 +244,7 @@ contract ERC20PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc20Transfer";
         inputs[4] = vm.toString(
             abi.encode(

diff --git a/test/forge/predicates/ERC721Predicate.t.sol → forge/predicates/ERC721Predicate.t.sol b/test/forge/predicates/ERC721Predicate.t.sol → forge/predicates/ERC721Predicate.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.6.2;
 pragma experimental ABIEncoderV2;
 
-import "forge-std/Test.sol";
+import "lib/forge-std/src/Test.sol";
 import {ERC721Predicate} from "contracts/root/TokenPredicates/ERC721Predicate.sol";
 import {ERC721PredicateProxy} from "contracts/root/TokenPredicates/ERC721PredicateProxy.sol";
 import {DummyERC721} from "contracts/root/RootToken/DummyERC721.sol";
@@ -224,7 +224,7 @@ contract ERC721PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc721Transfer";
         inputs[4] = vm.toString(
             abi.encode(
@@ -253,7 +253,7 @@ contract ERC721PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc721Transfer";
         inputs[4] = vm.toString(
             abi.encode(
@@ -282,7 +282,7 @@ contract ERC721PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc721Transfer";
         inputs[4] = vm.toString(
             abi.encode(
@@ -314,7 +314,7 @@ contract ERC721PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc721Transfer";
         inputs[4] = vm.toString(
             abi.encode(

diff --git a/test/forge/predicates/EtherPredicate.t.sol → forge/predicates/EtherPredicate.t.sol b/test/forge/predicates/EtherPredicate.t.sol → forge/predicates/EtherPredicate.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.6.2;
 pragma experimental ABIEncoderV2;
 
-import "forge-std/Test.sol";
+import "lib/forge-std/src/Test.sol";
 import {EtherPredicate} from "contracts/root/TokenPredicates/EtherPredicate.sol";
 import {EtherPredicateProxy} from "contracts/root/TokenPredicates/EtherPredicateProxy.sol";
 
@@ -97,7 +97,7 @@ contract EtherPredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc20Transfer"; // same Transfer event signature
         inputs[4] = vm.toString(
             abi.encode(
@@ -121,7 +121,7 @@ contract EtherPredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc20Transfer";
         inputs[4] = vm.toString(
             abi.encode(
@@ -145,7 +145,7 @@ contract EtherPredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc20Transfer";
         inputs[4] = vm.toString(
             abi.encode(
@@ -169,7 +169,7 @@ contract EtherPredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc20Transfer";
         inputs[4] = vm.toString(
             abi.encode(

diff --git a/...predicates/MintableERC1155Predicate.t.sol → ...predicates/MintableERC1155Predicate.t.sol b/...predicates/MintableERC1155Predicate.t.sol → ...predicates/MintableERC1155Predicate.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.6.2;
 pragma experimental ABIEncoderV2;
 
-import "forge-std/Test.sol";
+import "lib/forge-std/src/Test.sol";
 import {MintableERC1155Predicate} from "contracts/root/TokenPredicates/MintableERC1155Predicate.sol";
 import {MintableERC1155PredicateProxy} from "contracts/root/TokenPredicates/MintableERC1155PredicateProxy.sol";
 import {DummyMintableERC1155} from "contracts/root/RootToken/DummyMintableERC1155.sol";
@@ -73,7 +73,7 @@ contract MintableERC1155PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc1155TransferBatch";
         inputs[4] = vm.toString(
             abi.encode(
@@ -212,7 +212,7 @@ contract MintableERC1155PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc1155TransferSingle";
         inputs[4] = vm.toString(
             abi.encode(
@@ -242,7 +242,7 @@ contract MintableERC1155PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc1155TransferSingle";
         inputs[4] = vm.toString(
             abi.encode(
@@ -273,7 +273,7 @@ contract MintableERC1155PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc1155TransferSingle";
         inputs[4] = vm.toString(
             abi.encode(
@@ -312,7 +312,7 @@ contract MintableERC1155PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc1155TransferSingle";
         inputs[4] = vm.toString(
             abi.encode(
@@ -371,7 +371,7 @@ contract MintableERC1155PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc1155TransferBatch";
         inputs[4] = vm.toString(
             abi.encode(

diff --git a/...e/predicates/MintableERC20Predicate.t.sol → ...e/predicates/MintableERC20Predicate.t.sol b/...e/predicates/MintableERC20Predicate.t.sol → ...e/predicates/MintableERC20Predicate.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.6.2;
 pragma experimental ABIEncoderV2;
 
-import "forge-std/Test.sol";
+import "lib/forge-std/src/Test.sol";
 import {MintableERC20PredicateProxy} from "contracts/root/TokenPredicates/MintableERC20PredicateProxy.sol";
 import {MintableERC20Predicate} from "contracts/root/TokenPredicates/MintableERC20Predicate.sol";
 
@@ -59,7 +59,7 @@ contract MintableERC20PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc20Transfer";
         inputs[4] = vm.toString(
             abi.encode(
@@ -165,7 +165,7 @@ contract MintableERC20PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc20Transfer";
         inputs[4] = vm.toString(
             abi.encode(
@@ -195,7 +195,7 @@ contract MintableERC20PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc20Transfer";
         inputs[4] = vm.toString(
             abi.encode(
@@ -224,7 +224,7 @@ contract MintableERC20PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc20Transfer";
         inputs[4] = vm.toString(
             abi.encode(
@@ -256,7 +256,7 @@ contract MintableERC20PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc20Transfer";
         inputs[4] = vm.toString(
             abi.encode(

diff --git a/.../predicates/MintableERC721Predicate.t.sol → .../predicates/MintableERC721Predicate.t.sol b/.../predicates/MintableERC721Predicate.t.sol → .../predicates/MintableERC721Predicate.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.6.2;
 pragma experimental ABIEncoderV2;
 
-import "forge-std/Test.sol";
+import "lib/forge-std/src/Test.sol";
 import {MintableERC721Predicate} from "contracts/root/TokenPredicates/MintableERC721Predicate.sol";
 import {MintableERC721PredicateProxy} from "contracts/root/TokenPredicates/MintableERC721PredicateProxy.sol";
 
@@ -66,7 +66,7 @@ contract MintableERC721PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc721Transfer";
         inputs[4] = vm.toString(
             abi.encode(
@@ -252,7 +252,7 @@ contract MintableERC721PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc721Transfer";
         inputs[4] = vm.toString(
             abi.encode(
@@ -281,7 +281,7 @@ contract MintableERC721PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc721Transfer";
         inputs[4] = vm.toString(
             abi.encode(
@@ -310,7 +310,7 @@ contract MintableERC721PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc721Transfer";
         inputs[4] = vm.toString(
             abi.encode(
@@ -342,7 +342,7 @@ contract MintableERC721PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc721Transfer";
         inputs[4] = vm.toString(
             abi.encode(
@@ -385,7 +385,7 @@ contract MintableERC721PredicateTest is Test {
         string[] memory inputs = new string[](5);
         inputs[0] = "npx";
         inputs[1] = "ts-node";
-        inputs[2] = "test/forge/predicates/utils/rlpEncoder.ts";
+        inputs[2] = "forge/predicates/utils/rlpEncoder.ts";
         inputs[3] = "erc721TransferWithMetadata";
         inputs[4] = vm.toString(
             abi.encode(

diff --git a/test/forge/predicates/utils/rlpEncoder.ts → forge/predicates/utils/rlpEncoder.ts b/test/forge/predicates/utils/rlpEncoder.ts → forge/predicates/utils/rlpEncoder.ts
diff --git a/foundry.toml b/foundry.toml
@@ -1,6 +1,7 @@
 [profile.default]
 src = "contracts"
 out = "out"
+test = "forge"
 libs = [
     "lib",
     "node_modules",