Merge pull request #131 from 0xneves/echidna-owner

fix: echidna tests for good
blockful-io · Dec 7, 2023 · 2a35d9b · 2a35d9b
2 parents 5a7eecb + a1e50f3
commit 2a35d9b
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 55 deletions.
diff --git a/.github/workflows/fuzz-testing.yml b/.github/workflows/fuzz-testing.yml
@@ -1,59 +1,58 @@
 name: Fuzz Testing
 
 on:
-  push:
-    branches:
-      - main
-  pull_request:
+    push:
+        branches:
+            - main
+    pull_request:
 
 jobs:
-  echidna:
-    name: Echidna
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        testName:
-          - TestFactory
-          - TestSwaplace
-
-    env:
-      DEPLOYER_PRIVATE_KEY: ${{ secrets.DEPLOYER_PRIVATE_KEY }}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up node
-        uses: actions/setup-node@v1
-        with:
-          node-version: 18.16.0
-
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
-
-      - name: Install node dependencies
-        run: yarn install
-
-      - name: Install pip3
-        run: |
-          python -m pip install --upgrade pip
-
-      - name: Install slither
-        run: |
-          pip3 install slither-analyzer
-
-      - name: Install echidna
-        run: |
-          sudo wget -O /tmp/echidna-2.2.1-Linux.zip https://github.com/crytic/echidna/releases/download/v2.2.1/echidna-2.2.1-Linux.zip
-          sudo unzip /tmp/echidna-2.2.1-Linux.zip -d /usr/bin
-          cd /usr/bin
-          ls -a
-          sudo chmod +x /usr/bin/echidna
-
-      - name: Run ${{ matrix.testName }} as properties
-        run: echidna . --contract ${{ matrix.testName }} --test-mode property --config echidna.config.yml
-
-      - name: Run ${{ matrix.testName }} as assertion
-        run: echidna . --contract ${{ matrix.testName }} --test-mode assertion --config echidna.config.yml
+    echidna:
+        name: Echidna
+        runs-on: ubuntu-latest
+        strategy:
+            fail-fast: false
+            matrix:
+                testName:
+                    - TestFactory
+                    - TestSwaplace
+
+        env:
+            DEPLOYER_PRIVATE_KEY: ${{ secrets.DEPLOYER_PRIVATE_KEY }}
+
+        steps:
+            - uses: actions/checkout@v2
+
+            - name: Set up node
+              uses: actions/setup-node@v1
+              with:
+                  node-version: 18.16.0
+
+            - name: Set up Python 3.8
+              uses: actions/setup-python@v2
+              with:
+                  python-version: 3.8
+
+            - name: Install node dependencies
+              run: yarn install
+
+            - name: Install pip3
+              run: |
+                  python -m pip install --upgrade pip
+
+            - name: Install slither
+              run: |
+                  pip3 install slither-analyzer
+
+            - name: Install echidna
+              run: |
+                  sudo wget -O /tmp/echidna-2.2.1-Linux.zip https://github.com/crytic/echidna/releases/download/v2.2.1/echidna-2.2.1-Linux.zip
+                  sudo unzip /tmp/echidna-2.2.1-Linux.zip -d /usr/bin
+                  sudo tar -xf /usr/bin/echidna.tar.gz -C /usr/bin
+                  sudo chmod +x /usr/bin/echidna
+
+            - name: Run ${{ matrix.testName }} as properties
+              run: echidna . --contract ${{ matrix.testName }} --test-mode property --config echidna.config.yml
+
+            - name: Run ${{ matrix.testName }} as assertion
+              run: echidna . --contract ${{ matrix.testName }} --test-mode assertion --config echidna.config.yml
diff --git a/contracts/echidna/TestSwapFactory.sol b/contracts/echidna/TestSwapFactory.sol
@@ -37,7 +37,6 @@ contract TestFactory is SwapFactory {
             make_asset_array(addr, amountOrId)
         );
 
-        assert(owner != address(0));
         assert(swap.expiry > block.timestamp);
         assert(swap.biding.length > 0);
         assert(swap.asking.length > 0);