refactor: use slashed paths (#2536)

* refactor: use slashed paths * refactor: safer ffi function and return non hex as string (#2520) * bump ethers * rm leftover
charisma98 · Aug 1, 2022 · 81764d5 · 81764d5
1 parent 9f3efa5
commit 81764d5
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 66 deletions.
diff --git a/anvil/tests/it/anvil.rs b/anvil/tests/it/anvil.rs
@@ -20,7 +20,7 @@ async fn test_can_change_mining_mode() {
     let num = provider.get_block_number().await.unwrap();
     assert_eq!(num.as_u64(), 0);
 
-    tokio::time::sleep(std::time::Duration::from_millis(500)).await;
+    tokio::time::sleep(std::time::Duration::from_millis(700)).await;
     let num = provider.get_block_number().await.unwrap();
     assert_eq!(num.as_u64(), 1);
 }

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -55,6 +55,7 @@ walkdir = "2.3.2"
 dunce = "1.0.2"
 glob = "0.3.0"
 globset = "0.4.8"
+path-slash = "0.2.0"
 
 # misc
 eyre = "0.6"
@@ -83,7 +84,6 @@ foundry-cli-test-utils = { path = "./test-utils" }
 pretty_assertions = "1.0.0"
 toml = "0.5"
 serial_test = "0.7.0"
-path-slash = "0.2.0"
 
 [features]
 default = ["rustls"]

diff --git a/cli/src/cmd/forge/create.rs b/cli/src/cmd/forge/create.rs
@@ -21,6 +21,7 @@ use eyre::Context;
 use foundry_common::fs;
 use foundry_config::Config;
 use foundry_utils::parse_tokens;
+
 use rustc_hex::ToHex;
 use serde_json::json;
 use std::{path::PathBuf, sync::Arc};
@@ -97,7 +98,7 @@ impl CreateArgs {
 
         if let Some(ref mut path) = self.contract.path {
             // paths are absolute in the project's output
-            *path = format!("{}", canonicalized(project.root().join(&path)).display());
+            *path = canonicalized(project.root().join(&path)).to_string_lossy().to_string();
         }
 
         let (abi, bin, _) = utils::remove_contract(&mut output, &self.contract)?;
@@ -245,6 +246,7 @@ impl CreateArgs {
         }
 
         let (deployed_contract, receipt) = deployer.send_with_receipt().await?;
+
         let address = deployed_contract.address();
         if self.json {
             let output = json!({

diff --git a/cli/src/cmd/forge/inspect.rs b/cli/src/cmd/forge/inspect.rs
@@ -8,13 +8,17 @@ use crate::{
 };
 use clap::Parser;
 use comfy_table::Table;
-use ethers::prelude::{
-    artifacts::output_selection::{
-        BytecodeOutputSelection, ContractOutputSelection, DeployedBytecodeOutputSelection,
-        EvmOutputSelection, EwasmOutputSelection,
+use ethers::{
+    prelude::{
+        artifacts::output_selection::{
+            BytecodeOutputSelection, ContractOutputSelection, DeployedBytecodeOutputSelection,
+            EvmOutputSelection, EwasmOutputSelection,
+        },
+        info::ContractInfo,
     },
-    info::ContractInfo,
+    solc::utils::canonicalize,
 };
+
 use serde_json::{to_value, Value};
 use std::{fmt, str::FromStr};
 
@@ -64,8 +68,8 @@ impl Cmd for InspectArgs {
         // Build the project
         let project = modified_build_args.project()?;
         let outcome = if let Some(ref mut contract_path) = contract.path {
-            let target_path = dunce::canonicalize(&*contract_path)?;
-            *contract_path = target_path.to_string_lossy().into_owned();
+            let target_path = canonicalize(&*contract_path)?;
+            *contract_path = target_path.to_string_lossy().to_string();
             compile::compile_files(&project, vec![target_path], true)
         } else {
             compile::suppress_compile(&project)

diff --git a/cli/src/cmd/utils.rs b/cli/src/cmd/utils.rs
@@ -37,12 +37,14 @@ pub fn remove_contract(
         if let Some(suggestion) =
             suggestions::did_you_mean(&info.name, output.artifacts().map(|(name, _)| name)).pop()
         {
-            err = format!(
-                r#"{}
+            if suggestion != info.name {
+                err = format!(
+                    r#"{}
 
         Did you mean `{}`?"#,
-                err, suggestion
-            );
+                    err, suggestion
+                );
+            }
         }
         eyre::bail!(err)
     };

diff --git a/cli/src/compile.rs b/cli/src/compile.rs
@@ -250,6 +250,7 @@ pub fn compile_files(
     if !silent {
         println!("{output}");
     }
+
     Ok(output)
 }
 

diff --git a/cli/tests/it/cmd.rs b/cli/tests/it/cmd.rs
@@ -535,12 +535,7 @@ contract Foo {
     cmd.arg("inspect").arg(contract_name).arg("bytecode");
     check_output(cmd.stdout_lossy());
 
-    let info = format!(
-        "src{}{}:{}",
-        std::path::MAIN_SEPARATOR,
-        path.file_name().unwrap().to_string_lossy(),
-        contract_name
-    );
+    let info = format!("src/{}:{}", path.file_name().unwrap().to_string_lossy(), contract_name);
     cmd.forge_fuse().arg("inspect").arg(info).arg("bytecode");
     check_output(cmd.stdout_lossy());
 });

diff --git a/forge/src/multi_runner.rs b/forge/src/multi_runner.rs
@@ -524,8 +524,7 @@ mod tests {
             &results,
             BTreeMap::from([
                 (
-                    format!("core{}FailingSetup.t.sol:FailingSetupTest", std::path::MAIN_SEPARATOR)
-                        .as_str(),
+                    "core/FailingSetup.t.sol:FailingSetupTest",
                     vec![(
                         "setUp()",
                         false,
@@ -535,8 +534,7 @@ mod tests {
                     )],
                 ),
                 (
-                    format!("core{}MultipleSetup.t.sol:MultipleSetup", std::path::MAIN_SEPARATOR)
-                        .as_str(),
+                    "core/MultipleSetup.t.sol:MultipleSetup",
                     vec![(
                         "setUp()",
                         false,
@@ -546,42 +544,29 @@ mod tests {
                     )],
                 ),
                 (
-                    format!("core{}Reverting.t.sol:RevertingTest", std::path::MAIN_SEPARATOR)
-                        .as_str(),
+                    "core/Reverting.t.sol:RevertingTest",
                     vec![("testFailRevert()", true, None, None, None)],
                 ),
                 (
-                    format!(
-                        "core{}SetupConsistency.t.sol:SetupConsistencyCheck",
-                        std::path::MAIN_SEPARATOR
-                    )
-                    .as_str(),
+                    "core/SetupConsistency.t.sol:SetupConsistencyCheck",
                     vec![
                         ("testAdd()", true, None, None, None),
                         ("testMultiply()", true, None, None, None),
                     ],
                 ),
                 (
-                    format!("core{}DSStyle.t.sol:DSStyleTest", std::path::MAIN_SEPARATOR).as_str(),
+                    "core/DSStyle.t.sol:DSStyleTest",
                     vec![("testFailingAssertions()", true, None, None, None)],
                 ),
                 (
-                    format!(
-                        "core{}ContractEnvironment.t.sol:ContractEnvironmentTest",
-                        std::path::MAIN_SEPARATOR
-                    )
-                    .as_str(),
+                    "core/ContractEnvironment.t.sol:ContractEnvironmentTest",
                     vec![
                         ("testAddresses()", true, None, None, None),
                         ("testEnvironment()", true, None, None, None),
                     ],
                 ),
                 (
-                    format!(
-                        "core{}PaymentFailure.t.sol:PaymentFailureTest",
-                        std::path::MAIN_SEPARATOR
-                    )
-                    .as_str(),
+                    "core/PaymentFailure.t.sol:PaymentFailureTest",
                     vec![(
                         "testCantPay()",
                         false,
@@ -591,19 +576,14 @@ mod tests {
                     )],
                 ),
                 (
-                    format!(
-                        "core{}LibraryLinking.t.sol:LibraryLinkingTest",
-                        std::path::MAIN_SEPARATOR
-                    )
-                    .as_str(),
+                    "core/LibraryLinking.t.sol:LibraryLinkingTest",
                     vec![
                         ("testDirect()", true, None, None, None),
                         ("testNested()", true, None, None, None),
                     ],
                 ),
                 (
-                    format!("core{}Abstract.t.sol:AbstractTest", std::path::MAIN_SEPARATOR)
-                        .as_str(),
+                    "core/Abstract.t.sol:AbstractTest",
                     vec![("testSomething()", true, None, None, None)],
                 ),
             ]),
@@ -619,7 +599,7 @@ mod tests {
             &results,
             BTreeMap::from([
                 (
-                    format!("logs{}DebugLogs.t.sol:DebugLogsTest", std::path::MAIN_SEPARATOR).as_str(),
+                    "logs/DebugLogs.t.sol:DebugLogsTest",
                     vec![
                         (
                             "test1()",
@@ -788,7 +768,7 @@ mod tests {
                     ],
                 ),
                 (
-                    format!("logs{}HardhatLogs.t.sol:HardhatLogsTest", std::path::MAIN_SEPARATOR).as_str(),
+                    "logs/HardhatLogs.t.sol:HardhatLogsTest",
                     vec![
                         (
                             "testInts()",
@@ -1285,7 +1265,7 @@ Reason: `setEnv` failed to set an environment variable `{}={}`",
             for (test_name, result) in test_results {
                 let logs = decode_console_logs(&result.logs);
 
-                match test_name.as_ref() {
+                match test_name.as_str() {
                     "testPositive(uint256)" |
                     "testPositive(int256)" |
                     "testSuccessfulFuzz(uint128,uint128)" |
@@ -1372,15 +1352,7 @@ Reason: `setEnv` failed to set an environment variable `{}={}`",
         let results = runner
             .test(&Filter::new(".*", ".*", ".*Abstract.t.sol".to_string().as_str()), None, true)
             .unwrap();
-        println!("{:?}", results.keys());
-        assert!(results
-            .get(
-                format!("core{}Abstract.t.sol:AbstractTestBase", std::path::MAIN_SEPARATOR)
-                    .as_str()
-            )
-            .is_none());
-        assert!(results
-            .get(format!("core{}Abstract.t.sol:AbstractTest", std::path::MAIN_SEPARATOR).as_str())
-            .is_some());
+        assert!(results.get("core/Abstract.t.sol:AbstractTestBase").is_none());
+        assert!(results.get("core/Abstract.t.sol:AbstractTest").is_some());
     }
 }
diff --git a/forge/src/test_helpers.rs b/forge/src/test_helpers.rs
@@ -81,12 +81,8 @@ pub fn fuzz_executor<DB: DatabaseRef>(executor: &Executor) -> FuzzedExecutor {
     FuzzedExecutor::new(executor, proptest::test_runner::TestRunner::new(cfg), CALLER)
 }
 
-#[cfg(not(windows))]
 pub const RE_PATH_SEPARATOR: &str = "/";
 
-#[cfg(windows)]
-pub const RE_PATH_SEPARATOR: &str = "\\\\";
-
 pub mod filter {
     use super::*;
     use regex::Regex;
-Original file line number
+Diff line change
@@ Expand Up / @@ -250,6 +250,7 @@ pub fn compile_files( @@
         if !silent {
             println!("{output}");
         }
         Ok(output)
     }
@@ Expand Down @@