update style, refactor code

Signed-off-by: Hrushi20 <[email protected]>

Author: Hrushi20

token/cli/src/clap_app.rs

@@ -764,6 +764,8 @@ pub fn app<'a, 'b>(
                         .takes_value(true)
                         .number_of_values(2)
                         .hidden(true)
+                        .conflicts_with("transfer_fee_basis_points")
+                        .conflicts_with("transfer_fee_maximum_fee")
                         .help(
                             "Add a transfer fee to the mint. \
                             The mint authority can set the fee and withdraw collected fees.",
@@ -775,6 +777,8 @@ pub fn app<'a, 'b>(
                         .value_names(&["FEE_IN_BASIS_POINTS"])
                         .takes_value(true)
                         .number_of_values(1)
+                        .conflicts_with("transfer_fee")
+                        .requires("transfer_fee_maximum_fee")
                         .help(
                             "Add transfer fee to the mint. \
                             The mint authority can set the fee.",
@@ -786,9 +790,11 @@ pub fn app<'a, 'b>(
                         .value_names(&["MAXIMUM_FEE"])
                         .takes_value(true)
                         .number_of_values(1)
+                        .conflicts_with("transfer_fee")
+                        .requires("transfer_fee_basis_points")
                         .help(
-                            "Add a UI amount transfer fee to the mint. \
-                            The mint authority can set the fee and collected fee"
+                            "Add a UI amount maximum transfer fee to the mint. \
+                            The mint authority can set and collect fees"
                         )
                 )
                 .arg(

token/cli/src/command.rs

@@ -3472,7 +3472,7 @@ pub async fn process_command<'a>(
             let member_address = value_t!(arg_matches, "member_address", Pubkey).ok();
 
             let transfer_fee = arg_matches.values_of("transfer_fee").map(|mut v| {
-                println_display(config,"transfer_fee flag has been deprecated".to_string());
+                println_display(config,"transfer-fee has been deprecated and will be removed in a future release. Please specify --transfer-fee-basis-points and --transfer-fee-maximum-fee with a UI amount".to_string());
                 (
                     v.next()
                         .unwrap()
@@ -3485,44 +3485,12 @@ pub async fn process_command<'a>(
                 )
             });
 
-            let transfer_fee_basis_point = arg_matches.values_of("transfer_fee_basis_points").map(|mut v| {
-                v.next()
-                    .unwrap()
-                    .parse::<u16>()
-                    .unwrap_or_else(print_error_and_exit)
-            });
-
-            let transfer_fee_maximum_fee = arg_matches.values_of("transfer_fee_maximum_fee").map(|mut v| {
-                v.next()
-                    .unwrap()
-                    .parse::<f64>()
-                    .unwrap_or_else(print_error_and_exit)
-            });
-
-            let transfer_fee = match transfer_fee.is_some() {
-                true => match transfer_fee_basis_point.is_some() || transfer_fee_maximum_fee.is_some() {
-                    true => Err("transfer-fee-basis-point and transfer-fee-maximum-fee flag disable when using transfer-fee flag"),
-                    false => Ok(transfer_fee)
-                },
-                false => match transfer_fee_basis_point.is_some() && transfer_fee_maximum_fee.is_some() {
-                    true => Ok(Some((transfer_fee_basis_point.unwrap(), (transfer_fee_maximum_fee.unwrap() * (u64::pow(10, decimals.into())) as f64) as u64))),
-                    false =>  if transfer_fee_basis_point.is_some() {
-                        Err("Missing transfer_fee_maximum_fee flag")
-                    }else if transfer_fee_maximum_fee.is_some() {
-                        Err("Missing transfer_fee_basis_point")
-                    }else{
-                        Ok(None)
-                    }
-                }
-            };
-
-            let transfer_fee = match transfer_fee {
-                Ok(result) => result,
-                Err(e) => {
-                    eprintln!("{}",e);
-                    exit(1);
-                }
-            };
+            let tranfer_fee_basis_point = value_of::<u16>(arg_matches, "transfer_fee_basis_points");
+            let transfer_fee_maximum_fee = value_of::<f64>(arg_matches, "transfer_fee_maximum_fee")
+                .map(|v| spl_token::ui_amount_to_amount(v, decimals));
+            let transfer_fee = tranfer_fee_basis_point
+                .map(|v| (v, transfer_fee_maximum_fee.unwrap()))
+                .or(transfer_fee);
 
             let (token_signer, token) =
                 get_signer(arg_matches, "token_keypair", &mut wallet_manager)

token/cli/tests/command.rs

@@ -124,7 +124,6 @@ async fn main() {
         async_trial!(default_account_state, test_validator, payer),
         async_trial!(transfer_fee, test_validator, payer),
         async_trial!(transfer_fee_basis_point, test_validator, payer),
-        // async_trial!(transfer_fee_maximum_fee, test_validator, payer),
         async_trial!(confidential_transfer, test_validator, payer),
         async_trial!(multisig_transfer, test_validator, payer),
         async_trial!(offline_multisig_transfer_with_nonce, test_validator, payer),
@@ -2535,7 +2534,7 @@ async fn transfer_fee_basis_point(test_validator: &TestValidator, payer: &Keypai
     write_keypair_file(&token, &token_keypair_file);
     let token_pubkey = token.pubkey();
     process_test_command(
-        &config, 
+        &config,
         payer,
         &[
             "spl-token",
@@ -2544,9 +2543,10 @@ async fn transfer_fee_basis_point(test_validator: &TestValidator, payer: &Keypai
             "--transfer-fee-basis-points",
             &transfer_fee_basis_points.to_string(),
             "--transfer-fee-maximum-fee",
-            &maximum_fee.to_string()
-        ]
-    ).await
+            &maximum_fee.to_string(),
+        ],
+    )
+    .await
     .unwrap();
 
     let account = config.rpc_client.get_account(&token_pubkey).await.unwrap();
@@ -2558,7 +2558,7 @@ async fn transfer_fee_basis_point(test_validator: &TestValidator, payer: &Keypai
     );
     assert_eq!(
         u64::from(extension.older_transfer_fee.maximum_fee),
-        (maximum_fee * i32::pow(10,decimal) as f64) as u64
+        (maximum_fee * i32::pow(10, decimal) as f64) as u64
     );
     assert_eq!(
         u16::from(extension.newer_transfer_fee.transfer_fee_basis_points),