From 722de942ca50d178cd3eaf428d21e164a668aaca Mon Sep 17 00:00:00 2001
From: Trent Nelson <trent@solana.com>
Date: Sat, 24 Apr 2021 01:49:35 -0600
Subject: [PATCH] SDK: More conversion for `DerivationPath`

---
 sdk/src/derivation_path.rs | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/sdk/src/derivation_path.rs b/sdk/src/derivation_path.rs
index c6ff35b87f..2818c55293 100644
--- a/sdk/src/derivation_path.rs
+++ b/sdk/src/derivation_path.rs
@@ -1,7 +1,7 @@
 use {
     core::{iter::IntoIterator, slice::Iter},
     derivation_path::{ChildIndex, DerivationPath as DerivationPathInner},
-    std::{fmt, str::FromStr},
+    std::{convert::{Infallible, TryFrom}, fmt, str::FromStr},
     thiserror::Error,
 };
 
@@ -9,13 +9,21 @@ const ACCOUNT_INDEX: usize = 2;
 const CHANGE_INDEX: usize = 3;
 
 /// Derivation path error.
-#[derive(Error, Debug, Clone)]
+#[derive(Error, Debug, Clone, PartialEq)]
 pub enum DerivationPathError {
     #[error("invalid derivation path: {0}")]
     InvalidDerivationPath(String),
+    #[error("infallible")]
+    Infallible,
 }
 
-#[derive(PartialEq)]
+impl From<Infallible> for DerivationPathError {
+    fn from(_: Infallible) -> Self {
+        Self::Infallible
+    }
+}
+
+#[derive(Clone, PartialEq)]
 pub struct DerivationPath(DerivationPathInner);
 
 impl Default for DerivationPath {
@@ -24,6 +32,13 @@ impl Default for DerivationPath {
     }
 }
 
+impl TryFrom<&str> for DerivationPath {
+    type Error = DerivationPathError;
+    fn try_from(s: &str) -> Result<Self, Self::Error> {
+        Self::from_key_str(s)
+    }
+}
+
 impl DerivationPath {
     fn new<P: Into<Box<[ChildIndex]>>>(path: P) -> Self {
         Self(DerivationPathInner::new(path))