Remove --derivation-path option (#8741) (#8747)

automerge

clap-utils/src/input_parsers.rs

@@ -4,7 +4,7 @@ use crate::keypair::{
 };
 use chrono::DateTime;
 use clap::ArgMatches;
-use solana_remote_wallet::remote_wallet::{DerivationPath, RemoteWalletManager};
+use solana_remote_wallet::remote_wallet::RemoteWalletManager;
 use solana_sdk::{
     clock::UnixTimestamp,
     native_token::sol_to_lamports,
@@ -133,16 +133,6 @@ pub fn lamports_of_sol(matches: &ArgMatches<'_>, name: &str) -> Option<u64> {
     value_of(matches, name).map(sol_to_lamports)
 }
 
-pub fn derivation_of(matches: &ArgMatches<'_>, name: &str) -> Option<DerivationPath> {
-    matches.value_of(name).map(|derivation_str| {
-        let derivation_str = derivation_str.replace("'", "");
-        let mut parts = derivation_str.split('/');
-        let account = parts.next().map(|account| account.parse::<u32>().unwrap());
-        let change = parts.next().map(|change| change.parse::<u32>().unwrap());
-        DerivationPath { account, change }
-    })
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -317,40 +307,4 @@ mod tests {
             .get_matches_from(vec!["test", "--single", "0.03"]);
         assert_eq!(lamports_of_sol(&matches, "single"), Some(30000000));
     }
-
-    #[test]
-    fn test_derivation_of() {
-        let matches = app()
-            .clone()
-            .get_matches_from(vec!["test", "--single", "2/3"]);
-        assert_eq!(
-            derivation_of(&matches, "single"),
-            Some(DerivationPath {
-                account: Some(2),
-                change: Some(3)
-            })
-        );
-        assert_eq!(derivation_of(&matches, "another"), None);
-        let matches = app()
-            .clone()
-            .get_matches_from(vec!["test", "--single", "2"]);
-        assert_eq!(
-            derivation_of(&matches, "single"),
-            Some(DerivationPath {
-                account: Some(2),
-                change: None
-            })
-        );
-        assert_eq!(derivation_of(&matches, "another"), None);
-        let matches = app()
-            .clone()
-            .get_matches_from(vec!["test", "--single", "2'/3'"]);
-        assert_eq!(
-            derivation_of(&matches, "single"),
-            Some(DerivationPath {
-                account: Some(2),
-                change: Some(3)
-            })
-        );
-    }
 }

clap-utils/src/keypair.rs

@@ -1,8 +1,4 @@
-use crate::{
-    input_parsers::{derivation_of, pubkeys_sigs_of},
-    offline::SIGNER_ARG,
-    ArgConstant,
-};
+use crate::{input_parsers::pubkeys_sigs_of, offline::SIGNER_ARG, ArgConstant};
 use bip39::{Language, Mnemonic, Seed};
 use clap::{ArgMatches, Error, ErrorKind};
 use rpassword::prompt_password_stderr;
@@ -84,7 +80,6 @@ pub fn signer_from_path(
             if let Some(wallet_manager) = wallet_manager {
                 Ok(Box::new(generate_remote_keypair(
                     path,
-                    derivation_of(matches, "derivation_path"),
                     wallet_manager,
                     matches.is_present("confirm_key"),
                     keypair_name,