upd

shielder/Makefile

@@ -7,6 +7,7 @@ help: # Show help for each of the Makefile recipes.
 .PHONY: build-psp22
 build-psp22: ## Builds psp22 contracts.
 	@echo "Building psp22 contract" ; \
+	git submodule update --init ; \
 	cargo contract build --quiet --manifest-path PSP22/Cargo.toml --features "contract" --release ; \
 
 .PHONY: build-shielder
@@ -17,10 +18,10 @@ build-shielder: ## Builds shielder contracts.
 .PHONY: setup-tests
 setup-tests: build-psp22 ## Builds contracts and generates wrappers.
 
-.PHONY: drink-tests
-drink-tests: ## Runs tests for drink contract.
+.PHONY: tests
+tests: ## Runs tests for contract.
 	@echo "Running drink tests" ; \
 	cargo test --quiet --manifest-path contract/Cargo.toml --release -- --nocapture ; \
 
 .PHONY:
-all: setup-tests drink-tests ## Runs all tests.
+all: setup-tests tests ## Runs all tests.

shielder/contract/drink_tests/mod.rs

@@ -4,7 +4,7 @@ use drink::{session::Session, AccountId32};
 
 use crate::{
     drink_tests::utils::{chain::*, ops::*, psp22::*, shielder::*},
-    mocked_zk::merkle::MerkleTree,
+    test_utils::merkle::MerkleTree,
 };
 
 #[drink::contract_bundle_provider]

shielder/contract/drink_tests/utils/chain.rs

@@ -1,3 +1,4 @@
+use crate::drink_tests::utils::ACCOUNT_INITIAL_AMOUNT;
 use drink::{runtime::MinimalRuntime, session::Session, AccountId32};
 
 pub fn init_acc_with_balance(
@@ -6,23 +7,23 @@ pub fn init_acc_with_balance(
 ) -> Result<(), Box<dyn std::error::Error>> {
     session
         .sandbox()
-        .mint_into(acc.clone(), 1000000000000000)
+        .mint_into(acc.clone(), ACCOUNT_INITIAL_AMOUNT)
         .unwrap();
     Ok(())
 }
 
 pub fn init_alice(
     session: &mut Session<MinimalRuntime>,
 ) -> Result<AccountId32, Box<dyn std::error::Error>> {
-    let res: AccountId32 = AccountId32::new([2u8; 32]);
+    let res = AccountId32::new([2u8; 32]);
     init_acc_with_balance(session, &res)?;
     Ok(res)
 }
 
 pub fn init_bob(
     session: &mut Session<MinimalRuntime>,
 ) -> Result<AccountId32, Box<dyn std::error::Error>> {
-    let res: AccountId32 = AccountId32::new([3u8; 32]);
+    let res = AccountId32::new([3u8; 32]);
     init_acc_with_balance(session, &res)?;
     Ok(res)
 }

shielder/contract/drink_tests/utils/mod.rs

@@ -2,3 +2,5 @@ pub mod chain;
 pub mod ops;
 pub mod psp22;
 pub mod shielder;
+
+pub const ACCOUNT_INITIAL_AMOUNT: u128 = 1_000_000_000_000_000;

shielder/contract/drink_tests/utils/psp22.rs

@@ -36,7 +36,7 @@ pub fn get_psp22_balance(
     let res: u128 = session.call_with_address(
         token.clone(),
         "PSP22::balance_of",
-        &[&*(*address).to_string()],
+        &[&address.to_string()],
         NO_ENDOWMENT,
     )??;
     Ok(res)
@@ -51,7 +51,7 @@ pub fn get_psp22_allowance(
     let res: u128 = session.call_with_address(
         token.clone(),
         "PSP22::allowance",
-        &[&*(*from).to_string(), &*(*to).to_string()],
+        &[&from.to_string(), &to.to_string()],
         NO_ENDOWMENT,
     )??;
     Ok(res)

shielder/contract/drink_tests/utils/shielder.rs

@@ -8,13 +8,13 @@ use crate::{
     drink_tests::{BundleProvider, UpdateOperation},
     mocked_zk::{
         account::Account,
-        merkle::MerkleTree,
         note::Note,
         ops::{OpPriv, Operation},
         relations::ZkProof,
         traits::Hashable,
         TOKENS_NUMBER,
     },
+    test_utils::merkle::MerkleTree,
     types::Scalar,
 };
 pub struct ShielderUserEnv {

shielder/contract/lib.rs

@@ -8,6 +8,8 @@ mod drink_tests;
 mod errors;
 mod merkle;
 pub mod mocked_zk;
+#[cfg(test)]
+pub mod test_utils;
 mod traits;
 mod types;
 

shielder/contract/mocked_zk/mod.rs

@@ -1,11 +1,14 @@
 pub mod account;
-#[cfg(feature = "std")]
-pub mod merkle;
 pub mod note;
 pub mod ops;
 pub mod relations;
 #[cfg(test)]
 mod tests;
 pub mod traits;
 
+use crate::types::Scalar;
+
 pub const TOKENS_NUMBER: usize = 10;
+pub const MOCKED_TOKEN: Scalar = Scalar {
+    bytes: [228_u8; 32],
+};

shielder/contract/mocked_zk/tests.rs

@@ -8,14 +8,11 @@ use super::{
 use crate::{
     contract::OpPub,
     errors::ShielderError,
-    mocked_zk::{merkle::MerkleTree, TOKENS_NUMBER},
+    mocked_zk::{MOCKED_TOKEN, TOKENS_NUMBER},
+    test_utils::merkle::MerkleTree,
     types::Scalar,
 };
 
-const MOCKED_TOKEN: Scalar = Scalar {
-    bytes: [228 as u8; 32],
-};
-
 fn create_empty_note_proof(id: Scalar, nullifier: Scalar, trapdoor: Scalar) -> (Scalar, ZkProof) {
     let mut tokens: [Scalar; TOKENS_NUMBER] = [0_u128.into(); TOKENS_NUMBER];
     tokens[0] = MOCKED_TOKEN;

shielder/contract/mocked_zk/merkle.rs → shielder/contract/test_utils/merkle.rs

@@ -1,6 +1,6 @@
-use crate::{errors::ShielderError, types::Scalar};
 use ink::env::hash::{CryptoHash, Sha2x256};
-use std::num::Wrapping;
+
+use crate::{errors::ShielderError, types::Scalar};
 
 /// depth of the tree
 pub const DEPTH: usize = 10;
@@ -31,18 +31,18 @@ impl MerkleTree {
         if self.next_leaf_idx == self.size {
             return Err(ShielderError::MerkleTreeLimitExceeded);
         }
-        let mut id = (Wrapping(self.next_leaf_idx) + Wrapping(self.size)).0;
+        let mut id = self.next_leaf_idx + self.size;
         self.nodes[id] = leaf_value;
 
         id /= 2;
         while id > 0 {
-            let left_n = self.nodes[(Wrapping(id) * Wrapping(2)).0];
-            let right_n = self.nodes[(Wrapping(id) * Wrapping(2) + Wrapping(1)).0];
+            let left_n = self.nodes[id * 2];
+            let right_n = self.nodes[id * 2 + 1];
             let hash = compute_hash(left_n, right_n);
             self.nodes[id] = hash;
             id /= 2;
         }
-        self.next_leaf_idx = (Wrapping(self.next_leaf_idx) + Wrapping(1)).0;
+        self.next_leaf_idx += 1;
         Ok(self.nodes[1])
     }
 
@@ -55,9 +55,9 @@ impl MerkleTree {
         if self.next_leaf_idx == self.size {
             return Err(ShielderError::MerkleTreeProofGenFail);
         }
-        let mut id = (Wrapping(leaf_id) + Wrapping(self.size)).0;
-        for node in res.iter_mut().take(DEPTH) {
-            *node = self.nodes[id ^ 1];
+        let mut id = leaf_id + self.size;
+        for i in 0..DEPTH {
+            res[i] = self.nodes[id ^ 1];
             id /= 2;
         }
         Ok(res)

shielder/contract/test_utils/mod.rs

@@ -0,0 +1 @@
+pub mod merkle;