Use forge-std instead of excerpted files

forge install: forge-std v1.7.4
PaimaStudios · Mar 12, 2024 · ffe7798 · ffe7798
1 parent 8d06ce1
commit ffe7798
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 1,890 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "packages/contracts/evm-contracts/lib/forge-std"]
+	path = packages/contracts/evm-contracts/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
diff --git a/.prettierignore b/.prettierignore
@@ -3,5 +3,5 @@
 contract-types/
 packaged/
 packages/engine/paima-rest/src/tsoa/routes.ts
-packages/contracts/evm-contracts/test-lib
+packages/contracts/evm-contracts/lib
 packages/contracts/evm-contracts/typechain-types
diff --git a/packages/contracts/evm-contracts/foundry.toml b/packages/contracts/evm-contracts/foundry.toml
@@ -2,9 +2,9 @@
 src = 'contracts' # the source directory
 test = 'test' # the test directory
 out = 'artifacts/forge' # the output directory (for artifacts)
-libs = ['test-lib'] # a list of library directories    
+libs = ['lib'] # a list of library directories    
 remappings = [ # a list of remappings
-  '@openzeppelin/=../../../node_modules/@openzeppelin/',
+  '@openzeppelin/=../../../node_modules/@openzeppelin/'
 ]
 cache_path = 'cache/forge'
 allow_paths = ["../../../node_modules"]

diff --git a/packages/contracts/evm-contracts/lib/forge-std b/packages/contracts/evm-contracts/lib/forge-std
diff --git a/packages/contracts/evm-contracts/test-lib/cheatcodes.sol b/packages/contracts/evm-contracts/test-lib/cheatcodes.sol