chore: crates/ directory

.gitattributes

@@ -1,4 +1,4 @@
 # auto-detection may fail for human-readable files, like the ones in abi/abi/*.sol
 **/*.sol linguist-language=Solidity
 
-abi/src/bindings/*.rs linguist-generated
+crates/abi/src/bindings/*.rs linguist-generated

Cargo.toml

@@ -1,25 +1,25 @@
 [workspace]
 members = [
-    "anvil",
-    "anvil/core",
-    "anvil/rpc",
-    "anvil/server",
-    "abi",
-    "binder",
-    "cast",
-    "chisel",
-    "cli",
-    "cli/test-utils",
-    "common",
-    "config",
-    "doc",
-    "evm",
-    "fmt",
-    "forge",
-    "macros",
-    "macros/impl",
-    "ui",
-    "utils",
+    "crates/anvil",
+    "crates/anvil/core",
+    "crates/anvil/rpc",
+    "crates/anvil/server",
+    "crates/abi",
+    "crates/binder",
+    "crates/cast",
+    "crates/chisel",
+    "crates/cli",
+    "crates/cli/test-utils",
+    "crates/common",
+    "crates/config",
+    "crates/doc",
+    "crates/evm",
+    "crates/fmt",
+    "crates/forge",
+    "crates/macros",
+    "crates/macros/impl",
+    "crates/ui",
+    "crates/utils",
 ]
 resolver = "2"
 

chisel/src/session_source.rs → crates/chisel/src/session_source.rs

@@ -19,7 +19,7 @@ use std::{collections::HashMap, fs, path::PathBuf};
 use yansi::Paint;
 
 /// Solidity source for the `Vm` interface in [forge-std](https://github.com/foundry-rs/forge-std)
-static VM_SOURCE: &str = include_str!("../../testdata/cheats/Vm.sol");
+static VM_SOURCE: &str = include_str!("../../../testdata/cheats/Vm.sol");
 
 /// Intermediate output for the compiled [SessionSource]
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]

cli/test-utils/src/script.rs → crates/cli/test-utils/src/script.rs

@@ -92,7 +92,7 @@ impl ScriptTester {
 
     /// Returns the path to the dir that contains testdata
     fn testdata_path() -> String {
-        format!("{}/../../testdata", env!("CARGO_MANIFEST_DIR"))
+        format!("{}/../../../testdata", env!("CARGO_MANIFEST_DIR"))
     }
 
     /// Initialises the test contracts by copying them into the workspace

cli/test-utils/src/util.rs → crates/cli/test-utils/src/util.rs

@@ -322,13 +322,13 @@ impl TestProject {
 
     /// Adds DSTest as a source under "test.sol"
     pub fn insert_ds_test(&self) -> PathBuf {
-        let s = include_str!("../../../testdata/lib/ds-test/src/test.sol");
+        let s = include_str!("../../../../testdata/lib/ds-test/src/test.sol");
         self.inner().add_source("test.sol", s).unwrap()
     }
 
     /// Adds `console.sol` as a source under "console.sol"
     pub fn insert_console(&self) -> PathBuf {
-        let s = include_str!("../../../testdata/logs/console.sol");
+        let s = include_str!("../../../../testdata/logs/console.sol");
         self.inner().add_source("console.sol", s).unwrap()
     }
 

cli/tests/it/script.rs → crates/cli/tests/it/script.rs

@@ -710,8 +710,8 @@ forgetest_async!(
         // Uncomment to recreate the broadcast log
         // std::fs::copy(
         //     "broadcast/Broadcast.t.sol/31337/run-latest.json",
-        //     PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../testdata/fixtures/broadcast.log.
-        // json" ), );
+        //     PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../testdata/fixtures/broadcast.
+        // log. json" ), );
 
         // Check broadcast logs
         // Ignore timestamp, blockHash, blockNumber, cumulativeGasUsed, effectiveGasPrice,
@@ -720,7 +720,7 @@ forgetest_async!(
 
         let fixtures_log = std::fs::read_to_string(
             PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-                .join("../testdata/fixtures/broadcast.log.json"),
+                .join("../../testdata/fixtures/broadcast.log.json"),
         )
         .unwrap();
         let _fixtures_log = re.replace_all(&fixtures_log, "");
@@ -735,7 +735,7 @@ forgetest_async!(
         // std::fs::copy(
         //     "cache/Broadcast.t.sol/31337/run-latest.json",
         //     PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-        //         .join("../testdata/fixtures/broadcast.sensitive.log.json"),
+        //         .join("../../testdata/fixtures/broadcast.sensitive.log.json"),
         // );
 
         // Check sensitive logs
@@ -744,7 +744,7 @@ forgetest_async!(
 
         let fixtures_log = std::fs::read_to_string(
             PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-                .join("../testdata/fixtures/broadcast.sensitive.log.json"),
+                .join("../../testdata/fixtures/broadcast.sensitive.log.json"),
         )
         .unwrap();
         let fixtures_log = re.replace_all(&fixtures_log, "");