From 1f9192a8e0b7bb1655535b7223c1376a11bfecfe Mon Sep 17 00:00:00 2001 From: NicolasCantu Date: Wed, 26 Mar 2025 12:34:52 +0100 Subject: [PATCH] Update tests --- src/pcd.rs | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/pcd.rs b/src/pcd.rs index fc7808b..2b7b965 100644 --- a/src/pcd.rs +++ b/src/pcd.rs @@ -3,6 +3,7 @@ use rs_merkle::{algorithms::Sha256, MerkleTree}; use serde::de::{DeserializeOwned, Error as DeError}; use serde::ser::SerializeStruct; use wasm_bindgen::JsValue; +use std::collections::btree_map::Keys; use std::collections::{BTreeMap, HashSet}; use std::hash::{Hash as StdHash, Hasher}; use std::fmt; @@ -613,7 +614,8 @@ mod tests { let pcd: BTreeMap = serde_json::from_value(clear_state_value).unwrap(); let public_data = BTreeMap::new(); let roles = BTreeMap::new(); - let commitments = PcdCommitments::new(&OutPoint::null(), &Pcd::new(pcd), &Pcd::new(public_data), &Roles::new(roles)).unwrap(); + let attributes = BTreeMap::from_iter(pcd.into_iter().chain(public_data)); + let commitments = PcdCommitments::new(&OutPoint::null(), &Pcd::new(attributes), &Roles::new(roles)).unwrap(); let new_state_merkle_root = commitments.create_merkle_tree().unwrap().root().unwrap(); let validation_hash1 = AnkValidationYesHash::from_merkle_root(new_state_merkle_root); @@ -674,7 +676,8 @@ mod tests { let pcd: BTreeMap = serde_json::from_value(clear_state_value).unwrap(); let public_data = BTreeMap::new(); let roles = BTreeMap::new(); - let commitments = PcdCommitments::new(&OutPoint::null(), &Pcd::new(pcd), &Pcd::new(public_data), &Roles::new(roles)).unwrap(); + let attributes = BTreeMap::from_iter(pcd.into_iter().chain(public_data)); + let commitments = PcdCommitments::new(&OutPoint::null(), &Pcd::new(attributes), &Roles::new(roles)).unwrap(); let new_state_merkle_root = commitments.create_merkle_tree().unwrap().root().unwrap(); let validation_hash_yes = AnkValidationYesHash::from_merkle_root(new_state_merkle_root); @@ -722,7 +725,8 @@ mod tests { let pcd: BTreeMap = serde_json::from_value(clear_state_value).unwrap(); let public_data = BTreeMap::new(); let roles = BTreeMap::new(); - let commitments = PcdCommitments::new(&OutPoint::null(), &Pcd::new(pcd), &Pcd::new(public_data), &Roles::new(roles)).unwrap(); + let attributes = BTreeMap::from_iter(pcd.into_iter().chain(public_data)); + let commitments = PcdCommitments::new(&OutPoint::null(), &Pcd::new(attributes), &Roles::new(roles)).unwrap(); let new_state_merkle_root = commitments.create_merkle_tree().unwrap().root().unwrap(); let validation_hash = AnkValidationYesHash::from_merkle_root(new_state_merkle_root); @@ -764,7 +768,8 @@ mod tests { let pcd: BTreeMap = serde_json::from_value(clear_state_value).unwrap(); let public_data = BTreeMap::new(); let roles = BTreeMap::new(); - let commitments = PcdCommitments::new(&OutPoint::null(), &Pcd::new(pcd), &Pcd::new(public_data), &Roles::new(roles)).unwrap(); + let attributes = BTreeMap::from_iter(pcd.into_iter().chain(public_data)); + let commitments = PcdCommitments::new(&OutPoint::null(), &Pcd::new(attributes), &Roles::new(roles)).unwrap(); let new_state_merkle_root = commitments.create_merkle_tree().unwrap().root().unwrap(); let validation_hash = AnkValidationYesHash::from_merkle_root(new_state_merkle_root); @@ -809,7 +814,8 @@ mod tests { let pcd: BTreeMap = serde_json::from_value(clear_state_value).unwrap(); let public_data = BTreeMap::new(); let roles = BTreeMap::new(); - let commitments = PcdCommitments::new(&OutPoint::null(), &Pcd::new(pcd), &Pcd::new(public_data), &Roles::new(roles)).unwrap(); + let attributes = BTreeMap::from_iter(pcd.into_iter().chain(public_data)); + let commitments = PcdCommitments::new(&OutPoint::null(), &Pcd::new(attributes), &Roles::new(roles)).unwrap(); let new_state_merkle_root = commitments.create_merkle_tree().unwrap().root().unwrap(); let alice_spend_key: SecretKey = alice_wallet @@ -857,7 +863,8 @@ mod tests { let pcd: BTreeMap = serde_json::from_value(clear_state_value).unwrap(); let public_data = BTreeMap::new(); let roles = BTreeMap::new(); - let commitments = PcdCommitments::new(&OutPoint::null(), &Pcd::new(pcd), &Pcd::new(public_data), &Roles::new(roles)).unwrap(); + let attributes = BTreeMap::from_iter(pcd.into_iter().chain(public_data)); + let commitments = PcdCommitments::new(&OutPoint::null(), &Pcd::new(attributes), &Roles::new(roles)).unwrap(); let new_state_merkle_root = commitments.create_merkle_tree().unwrap().root().unwrap(); let validation_hash = AnkValidationYesHash::from_merkle_root(new_state_merkle_root); @@ -909,7 +916,8 @@ mod tests { let pcd: BTreeMap = serde_json::from_value(clear_state_value).unwrap(); let public_data = BTreeMap::new(); let roles = BTreeMap::new(); - let commitments = PcdCommitments::new(&OutPoint::null(), &Pcd::new(pcd), &Pcd::new(public_data), &Roles::new(roles)).unwrap(); + let attributes = BTreeMap::from_iter(pcd.into_iter().chain(public_data)); + let commitments = PcdCommitments::new(&OutPoint::null(), &Pcd::new(attributes), &Roles::new(roles)).unwrap(); let new_state_merkle_root = commitments.create_merkle_tree().unwrap().root().unwrap(); // let validation_hash1 = AnkValidationYesHash::from_commitment(new_state_hash); @@ -962,7 +970,8 @@ mod tests { let pcd: BTreeMap = serde_json::from_value(clear_state_value).unwrap(); let public_data = BTreeMap::new(); let roles = BTreeMap::new(); - let commitments = PcdCommitments::new(&OutPoint::null(), &Pcd::new(pcd), &Pcd::new(public_data), &Roles::new(roles)).unwrap(); + let attributes = BTreeMap::from_iter(pcd.into_iter().chain(public_data)); + let commitments = PcdCommitments::new(&OutPoint::null(), &Pcd::new(attributes), &Roles::new(roles)).unwrap(); let new_state_merkle_root = commitments.create_merkle_tree().unwrap().root().unwrap(); let validation_hash = AnkValidationYesHash::from_merkle_root(new_state_merkle_root); @@ -1015,7 +1024,8 @@ mod tests { let pcd: BTreeMap = serde_json::from_value(clear_state_value).unwrap(); let public_data = BTreeMap::new(); let roles = BTreeMap::new(); - let commitments = PcdCommitments::new(&OutPoint::null(), &Pcd::new(pcd), &Pcd::new(public_data), &Roles::new(roles)).unwrap(); + let attributes = BTreeMap::from_iter(pcd.into_iter().chain(public_data)); + let commitments = PcdCommitments::new(&OutPoint::null(), &Pcd::new(attributes), &Roles::new(roles)).unwrap(); let new_state_merkle_root = commitments.create_merkle_tree().unwrap().root().unwrap(); let validation_hash = AnkValidationYesHash::from_merkle_root(new_state_merkle_root);