Revert "Tame overeager wallet manager (solana-labs#9262)"

This reverts commit ec4745d.
CriesofCarrots · Apr 18, 2020 · 70b7f8e · 70b7f8e
1 parent 6de5a78
commit 70b7f8e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 43 deletions.
diff --git a/clap-utils/src/keypair.rs b/clap-utils/src/keypair.rs
@@ -47,13 +47,6 @@ pub fn parse_keypair_path(path: &str) -> KeypairUrl {
     }
 }
 
-pub fn check_for_usb<S>(mut items: impl Iterator<Item = S>) -> bool
-where
-    S: Into<String>,
-{
-    items.any(|arg| matches!(parse_keypair_path(&arg.into()), KeypairUrl::Usb(_)))
-}
-
 pub fn presigner_from_pubkey_sigs(
     pubkey: &Pubkey,
     signers: &[(Pubkey, Signature)],
@@ -263,20 +256,4 @@ mod tests {
             sanitize_seed_phrase(seed_phrase)
         );
     }
-
-    #[test]
-    fn test_check_for_usb() {
-        let args: Vec<&str> = vec![];
-        assert_eq!(check_for_usb(args.into_iter()), false);
-        let args = vec!["usb://"];
-        assert_eq!(check_for_usb(args.into_iter()), true);
-        let args = vec!["other"];
-        assert_eq!(check_for_usb(args.into_iter()), false);
-        let args = vec!["other", "usb://", "another"];
-        assert_eq!(check_for_usb(args.into_iter()), true);
-        let args = vec!["other", "another"];
-        assert_eq!(check_for_usb(args.into_iter()), false);
-        let args = vec!["usb://", "usb://"];
-        assert_eq!(check_for_usb(args.into_iter()), true);
-    }
 }
diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -2,9 +2,7 @@ use clap::{crate_description, crate_name, AppSettings, Arg, ArgGroup, ArgMatches
 use console::style;
 
 use solana_clap_utils::{
-    input_validators::is_url,
-    keypair::{check_for_usb, SKIP_SEED_PHRASE_VALIDATION_ARG},
-    offline::SIGN_ONLY_ARG,
+    input_validators::is_url, keypair::SKIP_SEED_PHRASE_VALIDATION_ARG, offline::SIGN_ONLY_ARG,
     DisplayError,
 };
 use solana_cli::{
@@ -254,20 +252,12 @@ fn main() -> Result<(), Box<dyn error::Error>> {
     )
     .get_matches();
 
-    do_main(&matches, check_for_usb(std::env::args()))
-        .map_err(|err| DisplayError::new_as_boxed(err).into())
+    do_main(&matches).map_err(|err| DisplayError::new_as_boxed(err).into())
 }
 
-fn do_main(
-    matches: &ArgMatches<'_>,
-    need_wallet_manager: bool,
-) -> Result<(), Box<dyn error::Error>> {
+fn do_main(matches: &ArgMatches<'_>) -> Result<(), Box<dyn error::Error>> {
     if parse_settings(&matches)? {
-        let wallet_manager = if need_wallet_manager {
-            maybe_wallet_manager()?
-        } else {
-            None
-        };
+        let wallet_manager = maybe_wallet_manager()?;
 
         let (mut config, signers) = parse_args(&matches, wallet_manager)?;
         config.signers = signers.iter().map(|s| s.as_ref()).collect();

diff --git a/keygen/src/keygen.rs b/keygen/src/keygen.rs
@@ -8,7 +8,7 @@ use num_cpus;
 use solana_clap_utils::{
     input_validators::is_derivation,
     keypair::{
-        check_for_usb, keypair_from_seed_phrase, prompt_passphrase, signer_from_path,
+        keypair_from_seed_phrase, prompt_passphrase, signer_from_path,
         SKIP_SEED_PHRASE_VALIDATION_ARG,
     },
     DisplayError,
@@ -407,11 +407,7 @@ fn do_main(matches: &ArgMatches<'_>) -> Result<(), Box<dyn error::Error>> {
         Config::default()
     };
 
-    let wallet_manager = if check_for_usb(std::env::args()) {
-        maybe_wallet_manager()?
-    } else {
-        None
-    };
+    let wallet_manager = maybe_wallet_manager()?;
 
     match matches.subcommand() {
         ("pubkey", Some(matches)) => {