fixup! Merge branch 'origin/bat/refactor-masp-e2e' (#1714)

anoma · Jul 21, 2023 · a85e752 · a85e752
1 parent 8027b19
commit a85e752
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 45 deletions.
diff --git a/apps/src/lib/cli/utils.rs b/apps/src/lib/cli/utils.rs
@@ -327,8 +327,6 @@ where
 #[cfg(not(feature = "testing"))]
 /// A helper to exit after flushing output, borrowed from `clap::util` module.
 pub fn safe_exit(code: i32) -> ! {
-    use std::io::Write;
-
     let _ = std::io::stdout().lock().flush();
     let _ = std::io::stderr().lock().flush();
 

diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs
@@ -2022,7 +2022,7 @@ pub async fn epoch_sleep<C: namada::ledger::queries::Client + Sync>(
 ) {
     let start_epoch = query_and_print_epoch(client).await;
     loop {
-        tokio::time::sleep(Duration::from_secs(1)).await;
+        tokio::time::sleep(core::time::Duration::from_secs(1)).await;
         let current_epoch = query_epoch(client).await;
         if current_epoch > start_epoch {
             println!("Reached epoch {}", current_epoch);

diff --git a/shared/src/ledger/tx.rs b/shared/src/ledger/tx.rs
@@ -1111,10 +1111,7 @@ pub async fn build_bond<
 
     // TODO Should we state the same error message for the native token?
     check_balance_too_low_err(
-        &TokenAddress {
-            address: args.native_token,
-            sub_prefix: None,
-        },
+        &args.native_token,
         bond_source,
         args.amount,
         balance_key,
@@ -1205,10 +1202,7 @@ pub async fn build_ibc_transfer<
     let balance_key = token::balance_key(&token, &source);
 
     check_balance_too_low_err(
-        &TokenAddress {
-            address: token.clone(),
-            sub_prefix: sub_prefix.clone(),
-        },
+        &token,
         &source,
         args.amount,
         balance_key,
@@ -1398,15 +1392,8 @@ pub async fn build_transfer<
 
     args.amount = InputAmount::Validated(validated_amount);
     args.tx.fee_amount = InputAmount::Validated(validate_fee);
-    let sub_prefix = args
-        .sub_prefix
-        .as_ref()
-        .map(|k| k.parse().expect("Could not parse multi-token sub-prefix"));
     check_balance_too_low_err::<C>(
-        &TokenAddress {
-            address: token.clone(),
-            sub_prefix: sub_prefix.clone(),
-        },
+        &token,
         &source,
         validated_amount.amount,
         balance_key,
@@ -1814,7 +1801,7 @@ async fn target_exists_or_err<C: crate::ledger::queries::Client + Sync>(
 /// given amount, along with the balance even existing. force
 /// overrides this
 async fn check_balance_too_low_err<C: crate::ledger::queries::Client + Sync>(
-    token: &TokenAddress,
+    token: &Address,
     source: &Address,
     amount: token::Amount,
     balance_key: storage::Key,
@@ -1840,7 +1827,7 @@ async fn check_balance_too_low_err<C: crate::ledger::queries::Client + Sync>(
                 } else {
                     Err(Error::BalanceTooLow(
                         source.clone(),
-                        token.address.clone(),
+                        token.clone(),
                         amount.to_string_native(),
                         balance.to_string_native(),
                     ))
@@ -1857,10 +1844,7 @@ async fn check_balance_too_low_err<C: crate::ledger::queries::Client + Sync>(
                 );
                 Ok(())
             } else {
-                Err(Error::NoBalanceForToken(
-                    source.clone(),
-                    token.address.clone(),
-                ))
+                Err(Error::NoBalanceForToken(source.clone(), token.clone()))
             }
         }
     }

diff --git a/tests/src/integration/masp.rs b/tests/src/integration/masp.rs
@@ -138,7 +138,7 @@ fn masp_incentives() -> Result<()> {
         )
     });
 
-    let amt = (amt20 * masp_rewards[&(btc(), None)]).0 * (ep1.0 - ep0.0);
+    let amt = (amt20 * masp_rewards[&btc()]).0 * (ep1.0 - ep0.0);
     let denominated = DenominatedAmount {
         amount: amt,
         denom: NATIVE_MAX_DECIMAL_PLACES.into(),
@@ -162,7 +162,7 @@ fn masp_incentives() -> Result<()> {
             ],
         )
     });
-    let amt = (amt20 * masp_rewards[&(btc(), None)]).0 * (ep1.0 - ep0.0);
+    let amt = (amt20 * masp_rewards[&btc()]).0 * (ep1.0 - ep0.0);
     let denominated = DenominatedAmount {
         amount: amt,
         denom: NATIVE_MAX_DECIMAL_PLACES.into(),
@@ -208,7 +208,7 @@ fn masp_incentives() -> Result<()> {
             ],
         )
     });
-    let amt = (amt20 * masp_rewards[&(btc(), None)]).0 * (ep2.0 - ep0.0);
+    let amt = (amt20 * masp_rewards[&btc()]).0 * (ep2.0 - ep0.0);
     let denominated = DenominatedAmount {
         amount: amt,
         denom: NATIVE_MAX_DECIMAL_PLACES.into(),
@@ -232,7 +232,7 @@ fn masp_incentives() -> Result<()> {
             ],
         )
     });
-    let amt = (amt20 * masp_rewards[&(btc(), None)]).0 * (ep2.0 - ep0.0);
+    let amt = (amt20 * masp_rewards[&btc()]).0 * (ep2.0 - ep0.0);
     let denominated = DenominatedAmount {
         amount: amt,
         denom: NATIVE_MAX_DECIMAL_PLACES.into(),
@@ -339,7 +339,7 @@ fn masp_incentives() -> Result<()> {
             ],
         )
     });
-    let amt = (amt10 * masp_rewards[&(eth(), None)]).0 * (ep4.0 - ep3.0);
+    let amt = (amt10 * masp_rewards[&eth()]).0 * (ep4.0 - ep3.0);
     let denominated = DenominatedAmount {
         amount: amt,
         denom: NATIVE_MAX_DECIMAL_PLACES.into(),
@@ -364,8 +364,8 @@ fn masp_incentives() -> Result<()> {
             ],
         )
     });
-    let amt = ((amt20 * masp_rewards[&(btc(), None)]).0 * (ep4.0 - ep0.0))
-        + ((amt10 * masp_rewards[&(eth(), None)]).0 * (ep4.0 - ep3.0));
+    let amt = ((amt20 * masp_rewards[&btc()]).0 * (ep4.0 - ep0.0))
+        + ((amt10 * masp_rewards[&eth()]).0 * (ep4.0 - ep3.0));
     let denominated = DenominatedAmount {
         amount: amt,
         denom: NATIVE_MAX_DECIMAL_PLACES.into(),
@@ -435,7 +435,7 @@ fn masp_incentives() -> Result<()> {
             ],
         )
     });
-    let amt = (amt10 * masp_rewards[&(eth(), None)]).0 * (ep5.0 - ep3.0);
+    let amt = (amt10 * masp_rewards[&eth()]).0 * (ep5.0 - ep3.0);
     let denominated = DenominatedAmount {
         amount: amt,
         denom: NATIVE_MAX_DECIMAL_PLACES.into(),
@@ -461,8 +461,8 @@ fn masp_incentives() -> Result<()> {
             ],
         )
     });
-    let amt = ((amt20 * masp_rewards[&(btc(), None)]).0 * (ep.0 - ep0.0))
-        + ((amt10 * masp_rewards[&(eth(), None)]).0 * (ep5.0 - ep3.0));
+    let amt = ((amt20 * masp_rewards[&btc()]).0 * (ep.0 - ep0.0))
+        + ((amt10 * masp_rewards[&eth()]).0 * (ep5.0 - ep3.0));
     let denominated = DenominatedAmount {
         amount: amt,
         denom: NATIVE_MAX_DECIMAL_PLACES.into(),
@@ -530,7 +530,7 @@ fn masp_incentives() -> Result<()> {
             ],
         )
     });
-    let amt = (amt20 * masp_rewards[&(btc(), None)]).0 * (ep6.0 - ep0.0);
+    let amt = (amt20 * masp_rewards[&btc()]).0 * (ep6.0 - ep0.0);
     let denominated = DenominatedAmount {
         amount: amt,
         denom: NATIVE_MAX_DECIMAL_PLACES.into(),
@@ -555,8 +555,8 @@ fn masp_incentives() -> Result<()> {
             ],
         )
     });
-    let amt = ((amt20 * masp_rewards[&(btc(), None)]).0 * (ep6.0 - ep0.0))
-        + ((amt10 * masp_rewards[&(eth(), None)]).0 * (ep5.0 - ep3.0));
+    let amt = ((amt20 * masp_rewards[&btc()]).0 * (ep6.0 - ep0.0))
+        + ((amt10 * masp_rewards[&eth()]).0 * (ep5.0 - ep3.0));
     let denominated = DenominatedAmount {
         amount: amt,
         denom: NATIVE_MAX_DECIMAL_PLACES.into(),
@@ -583,7 +583,7 @@ fn masp_incentives() -> Result<()> {
             ],
         )
     });
-    let amt = (amt20 * masp_rewards[&(btc(), None)]).0 * (ep6.0 - ep0.0);
+    let amt = (amt20 * masp_rewards[&btc()]).0 * (ep6.0 - ep0.0);
     let denominated = DenominatedAmount {
         amount: amt,
         denom: NATIVE_MAX_DECIMAL_PLACES.into(),
@@ -607,7 +607,7 @@ fn masp_incentives() -> Result<()> {
             ],
         )
     });
-    let amt = (amt10 * masp_rewards[&(eth(), None)]).0 * (ep5.0 - ep3.0);
+    let amt = (amt10 * masp_rewards[&eth()]).0 * (ep5.0 - ep3.0);
     let denominated = DenominatedAmount {
         amount: amt,
         denom: NATIVE_MAX_DECIMAL_PLACES.into(),
@@ -632,8 +632,8 @@ fn masp_incentives() -> Result<()> {
             ],
         )
     });
-    let amt = ((amt20 * masp_rewards[&(btc(), None)]).0 * (ep6.0 - ep0.0))
-        + ((amt10 * masp_rewards[&(eth(), None)]).0 * (ep5.0 - ep3.0));
+    let amt = ((amt20 * masp_rewards[&btc()]).0 * (ep6.0 - ep0.0))
+        + ((amt10 * masp_rewards[&eth()]).0 * (ep5.0 - ep3.0));
     let denominated = DenominatedAmount {
         amount: amt,
         denom: NATIVE_MAX_DECIMAL_PLACES.into(),
@@ -658,7 +658,7 @@ fn masp_incentives() -> Result<()> {
             "--token",
             NAM,
             "--amount",
-            &((amt10 * masp_rewards[&(eth(), None)]).0 * (ep5.0 - ep3.0))
+            &((amt10 * masp_rewards[&eth()]).0 * (ep5.0 - ep3.0))
                 .to_string_native(),
             "--signer",
             BERTHA,
@@ -684,7 +684,7 @@ fn masp_incentives() -> Result<()> {
             "--token",
             NAM,
             "--amount",
-            &((amt20 * masp_rewards[&(btc(), None)]).0 * (ep6.0 - ep0.0))
+            &((amt20 * masp_rewards[&btc()]).0 * (ep6.0 - ep0.0))
                 .to_string_native(),
             "--signer",
             ALBERT,

diff --git a/wasm/wasm_source/src/vp_testnet_faucet.rs b/wasm/wasm_source/src/vp_testnet_faucet.rs
@@ -52,7 +52,7 @@ fn validate_tx(
                     ctx.read_post(key)?.unwrap_or_default();
                 let change = post.change() - pre.change();
                 let maybe_denom =
-                    storage_api::token::read_denom(&ctx.pre(), token, None)?;
+                    storage_api::token::read_denom(&ctx.pre(), token)?;
                 if maybe_denom.is_none() {
                     debug_log!(
                         "A denomination for token address {} does not exist \