gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remote-wallet: Plumb Locator into RemoteWalletInfo

Browse Source
This commit is contained in:
Trent Nelson
2021-04-24 01:57:55 -06:00
committed by Trent Nelson
parent 64fcb792c2
commit 3d12be29ec
3 changed files with 36 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
remote-wallet/src/remote_keypair.rs
View File

@@ -2,7 +2,7 @@ use {
crate::{
ledger::get_ledger_from_info,
remote_wallet::{
RemoteWallet, RemoteWalletError, RemoteWalletInfo, RemoteWalletManager,
Manufacturer, RemoteWallet, RemoteWalletError, RemoteWalletInfo, RemoteWalletManager,
RemoteWalletType,
},
},
@@ -61,7 +61,7 @@ pub fn generate_remote_keypair(
keypair_name: &str,
) -> Result<RemoteKeypair, RemoteWalletError> {
let (remote_wallet_info, derivation_path) = RemoteWalletInfo::parse_path(path)?;
if remote_wallet_info.manufacturer == "ledger" {
if remote_wallet_info.manufacturer == Manufacturer::Ledger {
let ledger = get_ledger_from_info(remote_wallet_info, keypair_name, wallet_manager)?;
let path = format!("{}{}", ledger.pretty_path, derivation_path.get_query());
Ok(RemoteKeypair::new(