remove --refund

anoma · Jul 4, 2024 · 7212f7e · 7212f7e
1 parent ca79554
commit 7212f7e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 37 deletions.
diff --git a/crates/apps_lib/src/cli.rs b/crates/apps_lib/src/cli.rs
@@ -3349,7 +3349,6 @@ pub mod args {
     pub const RAW_PUBLIC_KEY_HASH_OPT: ArgOpt<String> =
         RAW_PUBLIC_KEY_HASH.opt();
     pub const RECEIVER: Arg<String> = arg("receiver");
-    pub const REFUND: ArgFlag = flag("refund");
     pub const REFUND_TARGET: ArgOpt<WalletTransferTarget> =
         arg_opt("refund-target");
     pub const RELAYER: Arg<Address> = arg("relayer");
@@ -6480,7 +6479,6 @@ pub mod args {
                 amount: self.amount,
                 port_id: self.port_id,
                 channel_id: self.channel_id,
-                refund: self.refund,
             })
         }
     }
@@ -6494,7 +6492,6 @@ pub mod args {
             let amount = InputAmount::Unvalidated(AMOUNT.parse(matches));
             let port_id = PORT_ID.parse(matches);
             let channel_id = CHANNEL_ID.parse(matches);
-            let refund = REFUND.parse(matches);
             Self {
                 query,
                 output_folder,
@@ -6503,7 +6500,6 @@ pub mod args {
                 amount,
                 port_id,
                 channel_id,
-                refund,
             }
         }
 
@@ -6525,9 +6521,6 @@ pub mod args {
                 .arg(CHANNEL_ID.def().help(wrap!(
                     "The channel ID via which the token is received."
                 )))
-                .arg(REFUND.def().help(wrap!(
-                    "Generate the shielding transfer for refunding."
-                )))
         }
     }
 

diff --git a/crates/sdk/src/args.rs b/crates/sdk/src/args.rs
@@ -2662,6 +2662,4 @@ pub struct GenIbcShieldingTransfer<C: NamadaTypes = SdkTypes> {
     pub port_id: PortId,
     /// Channel ID via which the token is received
     pub channel_id: ChannelId,
-    /// Generate the shielding transfer for refunding
-    pub refund: bool,
 }
diff --git a/crates/sdk/src/masp.rs b/crates/sdk/src/masp.rs
@@ -876,7 +876,7 @@ impl<U: ShieldedUtils + MaybeSend + MaybeSync> ShieldedContext<U> {
         let mut masp_txs = Vec::new();
         for cmt in &tx.header.batch {
             let tx_data = tx.data(cmt).ok_or_else(|| {
-                Error::Other("Missing expected masp transaction".to_string())
+                Error::Other("Missing transaction data".to_string())
             })?;
             let ibc_msg = decode_message(&tx_data)
                 .map_err(|_| Error::Other("Invalid IBC message".to_string()))?;
@@ -890,7 +890,7 @@ impl<U: ShieldedUtils + MaybeSend + MaybeSync> ShieldedContext<U> {
             Ok(masp_txs)
         } else {
             Err(Error::Other(
-                "IBC meesage doesn't have masp transaction".to_string(),
+                "IBC message doesn't have masp transaction".to_string(),
             ))
         }
     }

diff --git a/crates/sdk/src/tx.rs b/crates/sdk/src/tx.rs
@@ -51,7 +51,7 @@ use namada_governance::storage::proposal::{
 };
 use namada_governance::storage::vote::ProposalVote;
 use namada_ibc::storage::channel_key;
-use namada_ibc::trace::{convert_to_address, is_nft_trace};
+use namada_ibc::trace::is_nft_trace;
 use namada_ibc::{
     decode_masp_tx_from_memo, IbcShieldingData, MsgNftTransfer, MsgTransfer,
 };
@@ -3526,22 +3526,17 @@ pub async fn gen_ibc_shielding_transfer<N: Namada>(
             .await?;
     let ibc_denom =
         rpc::query_ibc_denom(context, &args.token, Some(&source)).await;
-    let token = if args.refund {
-        convert_to_address(ibc_denom)
-            .map_err(|e| Error::Other(format!("Invalid token: {e}")))?
-    } else {
-        // Need to check the prefix
-        namada_ibc::received_ibc_token(
-            &ibc_denom,
-            &src_port_id,
-            &src_channel_id,
-            &args.port_id,
-            &args.channel_id,
-        )
-        .map_err(|e| {
-            Error::Other(format!("Getting IBC Token failed: error {e}"))
-        })?
-    };
+    // Need to check the prefix
+    let token = namada_ibc::received_ibc_token(
+        &ibc_denom,
+        &src_port_id,
+        &src_channel_id,
+        &args.port_id,
+        &args.channel_id,
+    )
+    .map_err(|e| {
+        Error::Other(format!("Getting IBC Token failed: error {e}"))
+    })?;
     let validated_amount =
         validate_amount(context, args.amount, &token, false).await?;
 

diff --git a/crates/tests/src/e2e/ibc_tests.rs b/crates/tests/src/e2e/ibc_tests.rs
@@ -299,7 +299,6 @@ fn run_ledger_ibc_with_hermes() -> Result<()> {
         1_000_000_000,
         &port_id_b,
         &channel_id_b,
-        false,
     )?;
     transfer(
         &test_a,
@@ -492,7 +491,6 @@ fn ibc_namada_gaia() -> Result<()> {
         100,
         &port_id_namada,
         &channel_id_namada,
-        false,
     )?;
     transfer_from_gaia(
         &test_gaia,
@@ -695,7 +693,6 @@ fn proposal_ibc_token_inflation() -> Result<()> {
         1_000_000,
         &port_id_b,
         &channel_id_b,
-        false,
     )?;
     transfer(
         &test_a,
@@ -2685,14 +2682,13 @@ fn gen_masp_tx(
     amount: u64,
     port_id: &PortId,
     channel_id: &ChannelId,
-    is_refund: bool,
 ) -> Result<PathBuf> {
     std::env::set_var(ENV_VAR_CHAIN_ID, dst_test.net.chain_id.to_string());
     let rpc = get_actor_rpc(dst_test, Who::Validator(0));
     let output_folder = dst_test.test_dir.path().to_string_lossy();
 
     let amount = amount.to_string();
-    let mut args = vec![
+    let args = vec![
         "ibc-gen-shielding",
         "--output-folder-path",
         &output_folder,
@@ -2710,10 +2706,6 @@ fn gen_masp_tx(
         &rpc,
     ];
 
-    if is_refund {
-        args.push("--refund");
-    }
-
     let mut client = run!(dst_test, Bin::Client, args, Some(120))?;
     let (_unread, matched) =
         client.exp_regex("Output IBC shielding transfer .*")?;