4nk/sdk_common
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove empty member condition

Browse Source
This commit is contained in:
NicolasCantu 2025-03-19 11:44:59 +01:00
parent b5bd076f1e
commit b71e3f7525
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/device.rs
View File

@ -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;
}

8
src/pcd.rs
View File

@ -74,11 +74,7 @@ impl StdHash for Member {
}
impl Member {
pub fn new(sp_addresses: Vec<SilentPaymentAddress>) -> Result<Self> {
if sp_addresses.is_empty() {
return Err(Error::msg("empty address set"));
}
pub fn new(sp_addresses: Vec<SilentPaymentAddress>) -> Self{
let unique_addresses: HashSet<_> = sp_addresses.into_iter().collect();
let res: Vec<String> = unique_addresses
@ -86,7 +82,7 @@ impl Member {
.map(|a| Into::<String>::into(*a))
.collect();
Ok(Self { sp_addresses: res })
Self { sp_addresses: res }
}
pub fn get_addresses(&self) -> Vec<String> {