tmp

clearmatics · Apr 23, 2021 · 8c79f27 · 8c79f27
1 parent 265c5ec
commit 8c79f27
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/scripts/ci b/scripts/ci
@@ -38,25 +38,25 @@ function check_format() {
 
 function check_contracts() {
     # Setup the zeth_contracts dir
-    ganache_setup
+    #ganache_setup
 
     # Run checks in zeth_contracts
     pushd zeth_contracts
     npm run check
     popd # zeth_contracts
 
     # Run contract tests (in python)
-    _setup_client
+    #_setup_client
 
-    ganache_start
+    #ganache_start
 
-    pushd client
-    . env/bin/activate
-    make test_contracts
-    deactivate
-    popd
+    #pushd client
+    #. env/bin/activate
+    #make test_contracts
+    #deactivate
+    #popd
 
-    ganache_stop
+    #ganache_stop
 }
 
 function check_client() {

diff --git a/zeth_contracts/contracts/BaseMixer.sol b/zeth_contracts/contracts/BaseMixer.sol
@@ -300,9 +300,9 @@ abstract contract BaseMixer is BaseMerkleTree, ERC223ReceivingContract
             // solhint-disable-next-line max-line-length
             13196537064117388418196223856311987714388543839552400408340921397545324034315));
         for (uint256 i = 0 ; i < _NUM_INPUTS; ++i) {
-            h = hash(h, bytes32(publicData[i]));
+            h = _hash(h, bytes32(publicData[i]));
         }
-        h = hash(h, bytes32(_NUM_INPUTS));
+        h = _hash(h, bytes32(_NUM_INPUTS));
         return uint256(h);
     }