feat: use solc api to provide specific paths / not globs

foundry-rs · Sep 13, 2021 · 0170d88 · 0170d88
1 parent 8b656b8
commit 0170d88
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/FooTest2.sol b/FooTest2.sol
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity =0.8.1;
+
+contract FooBar {
+    uint256 x;
+
+    function setUp() public {
+        x = 1;
+    }
+
+    function testX() public {
+        require(x == 1, "x is not one");
+    }
+}
diff --git a/src/dapp.rs b/src/dapp.rs
@@ -377,13 +377,13 @@ impl<'a> MultiContractRunner<'a> {
                         println!("Installing {}", upstream_version);
                         tokio::runtime::Runtime::new()?
                             .block_on(svm::install(&upstream_version))?;
+                        println!("Done!");
                         found_version = Some(upstream_version);
                     }
                 }
 
                 // we did not find a version
                 if let Some(found_version) = found_version {
-                    println!("Found latest version: {}", &found_version);
                     let entry = contracts_by_version.entry(found_version).or_insert(vec![]);
                     entry.push(path);
                 }
@@ -402,8 +402,7 @@ impl<'a> MultiContractRunner<'a> {
                     .clone();
                 compiler_path.push(format!("solc-{}", &version));
 
-                let files = files.join(",");
-                let mut solc = Solc::new(&files).solc_path(compiler_path);
+                let mut solc = Solc::new_with_paths(files).solc_path(compiler_path);
                 let lib_paths = lib_paths
                     .iter()
                     .filter(|path| !path.is_empty())