From b71e3f7525083e007c84dc5f75454aff3a29df55 Mon Sep 17 00:00:00 2001 From: NicolasCantu Date: Wed, 19 Mar 2025 11:44:59 +0100 Subject: [PATCH] Remove empty member condition --- src/device.rs | 4 ++-- src/pcd.rs | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/device.rs b/src/device.rs index 911ffba..03b93e9 100644 --- a/src/device.rs +++ b/src/device.rs @@ -19,7 +19,7 @@ pub struct Device { impl Device { pub fn new(sp_wallet: SpWallet) -> Self { let local_address = sp_wallet.get_client().get_receiving_address(); - let member = Member::new(vec![SilentPaymentAddress::try_from(local_address).unwrap()]).unwrap(); + let member = Member::new(vec![SilentPaymentAddress::try_from(local_address).unwrap()]); Self { sp_wallet, pairing_process_commitment: None, @@ -46,7 +46,7 @@ impl Device { pub fn unpair(&mut self) { let local_address = self.get_wallet().get_client().get_receiving_address(); - let member = Member::new(vec![SilentPaymentAddress::try_from(local_address).unwrap()]).unwrap(); + let member = Member::new(vec![SilentPaymentAddress::try_from(local_address).unwrap()]); self.paired_member = member; self.pairing_process_commitment = None; } diff --git a/src/pcd.rs b/src/pcd.rs index df4bd53..4555516 100644 --- a/src/pcd.rs +++ b/src/pcd.rs @@ -74,11 +74,7 @@ impl StdHash for Member { } impl Member { - pub fn new(sp_addresses: Vec) -> Result { - if sp_addresses.is_empty() { - return Err(Error::msg("empty address set")); - } - + pub fn new(sp_addresses: Vec) -> Self{ let unique_addresses: HashSet<_> = sp_addresses.into_iter().collect(); let res: Vec = unique_addresses @@ -86,7 +82,7 @@ impl Member { .map(|a| Into::::into(*a)) .collect(); - Ok(Self { sp_addresses: res }) + Self { sp_addresses: res } } pub fn get_addresses(&self) -> Vec {