From 2366fe4c09a7310a325eaffd23643331f7656472 Mon Sep 17 00:00:00 2001 From: Eric Corson Date: Tue, 25 Jul 2023 11:17:30 +0900 Subject: [PATCH] fixup! Fix up staking review fixes --- .../AllValidatorsTable/AllValidatorsTable.tsx | 2 +- packages/shared/lib/src/query.rs | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/apps/namada-interface/src/App/Staking/StakingOverview/AllValidatorsTable/AllValidatorsTable.tsx b/apps/namada-interface/src/App/Staking/StakingOverview/AllValidatorsTable/AllValidatorsTable.tsx index 997cd72c7f..90a351d4e9 100644 --- a/apps/namada-interface/src/App/Staking/StakingOverview/AllValidatorsTable/AllValidatorsTable.tsx +++ b/apps/namada-interface/src/App/Staking/StakingOverview/AllValidatorsTable/AllValidatorsTable.tsx @@ -89,7 +89,7 @@ const sortValidators = (sort: Sort, validators: Validator[]): Validator[] => { (a, b) => a.name.localeCompare(b.name) : sort.column === AllValidatorsColumn.VotingPower ? ((a, b) => - a.votingPower === undefined || b.votingPower === undefined ? 0 : + !a.votingPower || !b.votingPower ? 0 : a.votingPower.isLessThan(b.votingPower) ? -1 : 1) : sort.column === AllValidatorsColumn.Commission ? ((a, b) => a.commission.isLessThan(b.commission) ? -1 : 1) : diff --git a/packages/shared/lib/src/query.rs b/packages/shared/lib/src/query.rs index 9306e65f11..b1f1b0d5ba 100644 --- a/packages/shared/lib/src/query.rs +++ b/packages/shared/lib/src/query.rs @@ -154,11 +154,8 @@ impl Query { ) -> Result { let owner_addresses: Vec
= owner_addresses .into_iter() - .map(|address| { - //TODO: Handle errors(unwrap) - let address_str = &(address.as_string().unwrap()[..]); - Address::from_str(address_str).unwrap() - }) + .filter_map(|address| address.as_string()) + .filter_map(|address| Address::from_str(&address).ok()) .collect(); let mut validators_per_address: HashMap> = HashMap::new(); @@ -173,10 +170,8 @@ impl Query { validators_per_address.insert(address, validators); } - let mut bonds: Vec<(Address, Address, String, String)> = - Vec::new(); - let mut unbonds: Vec<(Address, Address, String, String, String)> = - Vec::new(); + let mut bonds = vec![]; + let mut unbonds = vec![]; let epoch = namada::ledger::rpc::query_epoch(&self.client).await; for (owner, validators) in validators_per_address.into_iter() {