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

RemoteWallet: Improve DerivationPathComponent FromStr readability

Browse Source
This commit is contained in:
Trent Nelson
2020-07-20 17:05:22 -06:00
committed by mergify[bot]
parent 73f3d04798
commit b0d1c70718
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
remote-wallet/src/remote_wallet.rs
View File

@ -345,12 +345,13 @@ impl FromStr for DerivationPathComponent {
type Err = RemoteWalletError;
fn from_str(s: &str) -> Result<Self, Self::Err> {
// Replace str::splitn() with str::strip_suffix() once stabilized
let parts: Vec<_> = s.splitn(2, '\'').collect();
if parts.len() == 2 {
let index_str = if let Some(stripped) = s.strip_suffix('\'') {
eprintln!("all path components are promoted to hardened representation");
}
parts[0].parse::<u32>().map(|ki| ki.into()).map_err(|_| {
stripped
} else {
s
};
index_str.parse::<u32>().map(|ki| ki.into()).map_err(|_| {
RemoteWalletError::InvalidDerivationPath(format!(
"failed to parse path component: {:?}",
s