Fix failing CI, rename bin/echidna to bin/echidna-diffusc, and reintr…

…oduce copying bin/echidna-diffusc in installation instructions (#22) --------- Co-authored-by: William E Bodell III <[email protected]> * Dev debug failing CI fuzzing (#21) * Rename bin/echidna -> bin/echidna-diffusc * Reintroduce copying ./bin/echidna-diffusc to /usr/local/bin in README installation instructions --------- Co-authored-by: Rappie <[email protected]>
crytic · Aug 7, 2023 · 2665811 · 2665811
1 parent f2f9f4b
commit 2665811
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/ci-fork-mode.yml b/.github/workflows/ci-fork-mode.yml
@@ -49,8 +49,8 @@ jobs:
 
     - name: Install diffusc
       run: |
-        pip3 install .
-        sudo cp bin/echidna /usr/local/bin
+        pip3 install ".[test]"
+        sudo cp bin/echidna-diffusc /usr/local/bin
         solc-select install 0.8.17
         solc-select use 0.8.17
 

diff --git a/.github/workflows/ci-path-mode.yml b/.github/workflows/ci-path-mode.yml
@@ -33,8 +33,8 @@ jobs:
 
     - name: Install diffusc
       run: |
-        pip3 install .
-        sudo cp bin/echidna /usr/local/bin
+        pip3 install ".[test]"
+        sudo cp bin/echidna-diffusc /usr/local/bin
         solc-select install 0.8.11
         solc-select use 0.8.11
 

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -54,7 +54,7 @@ jobs:
         # Only run coverage on ubuntu-latest.
         run: |
           if [ ${{ matrix.os }} = "ubuntu-latest" ]; then
-            sudo cp bin/echidna /usr/local/bin
+            sudo cp bin/echidna-diffusc /usr/local/bin
             TEST_ARGS="--cov=diffusc --cov-append"
           elif [ ${{ matrix.os }} = "windows-2022" ]; then
             TEST_ARGS=""

diff --git a/README.md b/README.md
@@ -62,11 +62,12 @@ diffusc
 
 ## Setup
 
-After cloning this repo, run the setup script (ideally in a virtual environment):
+After cloning this repo, run the setup script (ideally in a virtual environment) and copy the `echidna-diffusc` binary to `/usr/local/bin`:
 ```bash
 git clone https://github.com/crytic/diffusc.git
 cd diffusc
 pip3 install .
+cp bin/echidna-diffusc /usr/local/bin
 ```
 
 ## Running Diffusc

diff --git a/bin/echidna → bin/echidna-diffusc b/bin/echidna → bin/echidna-diffusc
diff --git a/diffusc/core/echidna.py b/diffusc/core/echidna.py
@@ -22,8 +22,7 @@ def create_echidna_process(
     except OSError:
         pass
 
-    path_to_echidna_from_prefix = os.path.relpath(ECHIDNA_BIN_PATH, prefix)
-    call = [path_to_echidna_from_prefix]
+    call = ["echidna-diffusc"]
     call.extend([filename])
     call.extend(["--config", config])
     call.extend(["--contract", contract])