client/rpc: use the new token balance method

anoma · May 19, 2023 · 69b0745 · 69b0745
1 parent cc5043a
commit 69b0745
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs
@@ -925,7 +925,7 @@ pub async fn get_token_balance<C: namada::ledger::queries::Client + Sync>(
     client: &C,
     token: &Address,
     owner: &Address,
-) -> Option<token::Amount> {
+) -> token::Amount {
     namada::ledger::rpc::get_token_balance(client, token, owner).await
 }
 

diff --git a/apps/src/lib/client/tx.rs b/apps/src/lib/client/tx.rs
@@ -532,8 +532,7 @@ pub async fn submit_init_proposal<C: namada::ledger::queries::Client + Sync>(
             &args.native_token,
             &proposal.author,
         )
-        .await
-        .unwrap_or_default();
+        .await;
         if balance
             < token::Amount::from(governance_parameters.min_proposal_fund)
         {

diff --git a/shared/src/ledger/rpc.rs b/shared/src/ledger/rpc.rs
@@ -120,9 +120,8 @@ pub async fn get_token_balance<C: crate::ledger::queries::Client + Sync>(
     client: &C,
     token: &Address,
     owner: &Address,
-) -> Option<token::Amount> {
-    let balance_key = balance_key(token, owner);
-    query_storage_value(client, &balance_key).await
+) -> token::Amount {
+    unwrap_client_response::<C, _>(RPC.vp().token().balance(client, token, owner).await)
 }
 
 /// Get account's public key stored in its storage sub-space