Merge branch 'mardizzone/node-upgrade' of github.com:maticnetwork/gen…

…esis-contracts into mardizzone/node-upgrade
OKEAMAH · Nov 28, 2022 · cb617c9 · cb617c9
2 parents 66be528 + afc14a6
commit cb617c9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,4 +32,4 @@ jobs:
     - name: Generate genesis file
       run: bash generate.sh 15001 heimdall-15001
     - name: Run tests
-      run: npm run test:ci
+      run: npm run test:ci
diff --git a/scripts/run-test.sh b/scripts/run-test.sh
@@ -10,9 +10,11 @@ trap cleanup EXIT
 PWD=$(pwd)
 
 cleanup() {
-  echo "Cleaning up"
-  pkill -f ganache-cli
-  echo "Done"
+  if [ "$GITHUB_ACTIONS" != true ] ; then
+    echo "Cleaning up"
+    pkill -f ganache-cli
+    echo "Done"
+  fi
 }
 
 start_testrpc() {

diff --git a/test/StateReceiver.test.js b/test/StateReceiver.test.js
@@ -10,7 +10,7 @@ contract('StateReceiver', async (accounts) => {
 
         before(async function () {
             testStateReceiver = await TestStateReceiver.deployed()
-            testStateReceiver.setSystemAddress(accounts[0])
+            await testStateReceiver.setSystemAddress(accounts[0])
             testCommitState = await TestCommitState.deployed()
             testCommitStateAddr = testCommitState.address
         })