Remove empty member condition
This commit is contained in:
parent
feb7c36df2
commit
2b511caa14
@ -19,7 +19,7 @@ pub struct Device {
|
|||||||
impl Device {
|
impl Device {
|
||||||
pub fn new(sp_wallet: SpWallet) -> Self {
|
pub fn new(sp_wallet: SpWallet) -> Self {
|
||||||
let local_address = sp_wallet.get_client().get_receiving_address();
|
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 {
|
Self {
|
||||||
sp_wallet,
|
sp_wallet,
|
||||||
pairing_process_commitment: None,
|
pairing_process_commitment: None,
|
||||||
@ -46,7 +46,7 @@ impl Device {
|
|||||||
|
|
||||||
pub fn unpair(&mut self) {
|
pub fn unpair(&mut self) {
|
||||||
let local_address = self.get_wallet().get_client().get_receiving_address();
|
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.paired_member = member;
|
||||||
self.pairing_process_commitment = None;
|
self.pairing_process_commitment = None;
|
||||||
}
|
}
|
||||||
|
@ -74,11 +74,7 @@ impl StdHash for Member {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Member {
|
impl Member {
|
||||||
pub fn new(sp_addresses: Vec<SilentPaymentAddress>) -> Result<Self> {
|
pub fn new(sp_addresses: Vec<SilentPaymentAddress>) -> Self{
|
||||||
if sp_addresses.is_empty() {
|
|
||||||
return Err(Error::msg("empty address set"));
|
|
||||||
}
|
|
||||||
|
|
||||||
let unique_addresses: HashSet<_> = sp_addresses.into_iter().collect();
|
let unique_addresses: HashSet<_> = sp_addresses.into_iter().collect();
|
||||||
|
|
||||||
let res: Vec<String> = unique_addresses
|
let res: Vec<String> = unique_addresses
|
||||||
@ -86,7 +82,7 @@ impl Member {
|
|||||||
.map(|a| Into::<String>::into(*a))
|
.map(|a| Into::<String>::into(*a))
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
Ok(Self { sp_addresses: res })
|
Self { sp_addresses: res }
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_addresses(&self) -> Vec<String> {
|
pub fn get_addresses(&self) -> Vec<String> {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user