From f4e441f436a7c2c69f8cbbe285165de4eb961b8e Mon Sep 17 00:00:00 2001 From: Sosthene Date: Tue, 24 Jun 2025 17:13:30 +0200 Subject: [PATCH] Update tests --- src/process.rs | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/process.rs b/src/process.rs index 0e5ffa1..869943a 100644 --- a/src/process.rs +++ b/src/process.rs @@ -590,7 +590,7 @@ mod tests { SpClient, SpendKey }; - use crate::pcd::{Member, ValidationRule}; + use crate::pcd::{Member, ValidationRule, ZSTD_COMPRESSION_LEVEL}; use super::*; @@ -943,7 +943,7 @@ mod tests { #[test] fn test_valid_pairing_add_device() { let pairing_state = create_pairing_process_one(); - let mut paired_addresses: Vec = from_reader(pairing_state.public_data.get(PAIREDADDRESSES).unwrap().as_slice()).unwrap(); + let mut paired_addresses: Vec = serde_json::from_value(pairing_state.public_data.get_as_json(PAIREDADDRESSES).unwrap()).unwrap(); let mut pairing_process = Process::new(pairing_state.commited_in); pairing_process.insert_concurrent_state(pairing_state).unwrap(); let new_commitment = OutPoint::from_str("7f1a6d8923d6ee58a075c0e99e25472bb22a3eea221739281c2beaf829f03f27:0").unwrap(); @@ -956,8 +956,8 @@ mod tests { Member::new( paired_addresses.clone() )) - ]) - ); + ] + )); // Add Dave address let dave_address = create_dave_wallet().get_receiving_address(); @@ -980,7 +980,7 @@ mod tests { #[test] fn test_valid_pairing_rm_device() { let pairing_state = create_pairing_process_two(); - let mut paired_addresses: Vec = from_reader(pairing_state.public_data.get(PAIREDADDRESSES).unwrap().as_slice()).unwrap(); + let paired_addresses: Vec = serde_json::from_value(pairing_state.public_data.get_as_json(PAIREDADDRESSES).unwrap()).unwrap(); let mut pairing_process = Process::new(pairing_state.commited_in); pairing_process.insert_concurrent_state(pairing_state).unwrap(); let new_commitment = OutPoint::from_str("7f1a6d8923d6ee58a075c0e99e25472bb22a3eea221739281c2beaf829f03f27:0").unwrap(); @@ -993,8 +993,8 @@ mod tests { Member::new( paired_addresses.clone() )) - ]) - ); + ] + )); // Remove Dave address let dave_address = create_dave_wallet().get_receiving_address(); @@ -1037,7 +1037,7 @@ mod tests { #[test] fn test_error_pairing_add_device_wrong_signature() { let pairing_state = create_pairing_process_one(); - let mut paired_addresses: Vec = from_reader(pairing_state.public_data.get(PAIREDADDRESSES).unwrap().as_slice()).unwrap(); + let mut paired_addresses: Vec = serde_json::from_value(pairing_state.public_data.get_as_json(PAIREDADDRESSES).unwrap()).unwrap(); let mut pairing_process = Process::new(pairing_state.commited_in); pairing_process.insert_concurrent_state(pairing_state).unwrap(); let new_commitment = OutPoint::from_str("7f1a6d8923d6ee58a075c0e99e25472bb22a3eea221739281c2beaf829f03f27:0").unwrap(); @@ -1050,8 +1050,8 @@ mod tests { Member::new( paired_addresses.clone() )) - ]) - ); + ] + )); // Add Dave address let dave_address = create_dave_wallet().get_receiving_address(); @@ -1206,7 +1206,9 @@ mod tests { let state = dummy_process_state(); let mut new_state = state.clone(); let key_to_modify = state.pcd_commitment.keys().into_iter().next().unwrap(); - let updated_value = crate::serialization::ciborium_serialize(&Value::String("new_value1".to_owned())).unwrap(); + let mut serialized_value = Vec::new(); + serde_json::to_writer(&mut serialized_value, &Value::String("new_value1".to_owned())).unwrap(); + let updated_value = zstd::encode_all(serialized_value.as_slice(), ZSTD_COMPRESSION_LEVEL).unwrap(); new_state.update_value(key_to_modify.as_str(), updated_value.as_slice()).unwrap(); let alice_key: SecretKey = create_alice_wallet() .get_spend_key() @@ -1234,7 +1236,9 @@ mod tests { let state = dummy_process_state(); let mut new_state = state.clone(); let key_to_modify = state.pcd_commitment.keys().into_iter().next().unwrap(); - let updated_value = crate::serialization::ciborium_serialize(&Value::String("new_value1".to_owned())).unwrap(); + let mut serialized_value = Vec::new(); + serde_json::to_writer(&mut serialized_value, &Value::String("new_value1".to_owned())).unwrap(); + let updated_value = zstd::encode_all(serialized_value.as_slice(), ZSTD_COMPRESSION_LEVEL).unwrap(); new_state.update_value(key_to_modify.as_str(), updated_value.as_slice()).unwrap(); let carol_key: SecretKey = create_carol_wallet() .get_spend_key()