Merge branch 'main' into deniallugo-fork-cheatcode

.github/workflows/test.yml

@@ -93,30 +93,23 @@ jobs:
     smoke-test:
       name: smoke-test
       runs-on: ubuntu-22.04-github-hosted-16core
-      env:
-        TEST_REPO_DIR: test-repo
-
+
       steps:
       - name: Checkout code
         uses: actions/checkout@v4 
         with:
-          path: ${{ env.TEST_REPO_DIR }}
+          submodules: recursive
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: nightly-2023-09-21
-      
+
       - name: Run smoke-test
         env:
-          TEST_REPO: ${{ github.event.repository.name }}
-          TEST_REPO_DIR: "../${{ env.TEST_REPO_DIR }}"
           RUST_BACKTRACE: full
-        run: |
-          git clone https://github.com/matter-labs/zkfoundry-smoke-test
-          cd zkfoundry-smoke-test
-          ./smoke-test.sh
+        run: cd smoke-test && ./test.sh
 
     cheatcodes:
       name: cheatcode-test

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "crates/era-cheatcodes/tests/lib/forge-std"]
 	path = crates/era-cheatcodes/tests/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "smoke-test/lib/forge-std"]
+	path = smoke-test/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std

crates/common/src/zk_compile.rs

@@ -203,7 +203,7 @@ pub fn compile_smart_contracts(
 
     match zksolc.compile() {
         Ok(_) => {
-            println!("Compiled Successfully");
+            info!("Compiled Successfully");
             Ok(())
         }
         Err(err) => {
@@ -718,7 +718,7 @@ impl ZkSolc {
         if has_error {
             exit(1);
         } else if has_warning {
-            println!("Compiler run completed with warnings");
+            warn!("Compiler run completed with warnings");
         }
     }
     /// Handles and formats the errors present in the output JSON from the zksolc compiler.

crates/era-cheatcodes/.gitignore

@@ -1,6 +1,8 @@
 /target
 /Cargo.lock
 tests/*
+tests/src/fixtures/File/write_file.txt
+tests/src/fixtures/Json/write_test.json
 !tests/src
 !tests/lib
 !tests/test.sh