From 6632c08b01616b89f7bfc4e5844c9ea602586d94 Mon Sep 17 00:00:00 2001 From: thesimplekid Date: Tue, 5 Mar 2024 21:32:42 +0000 Subject: [PATCH] chore: remove unwraps from nut13 --- crates/cashu/src/error.rs | 5 +++++ crates/cashu/src/nuts/nut13.rs | 12 +++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/crates/cashu/src/error.rs b/crates/cashu/src/error.rs index 115d3157..edcc46be 100644 --- a/crates/cashu/src/error.rs +++ b/crates/cashu/src/error.rs @@ -55,6 +55,11 @@ pub enum Error { #[error("`{0}`")] Secret(#[from] super::secret::Error), #[error("`{0}`")] + NUT02(#[from] crate::nuts::nut02::Error), + #[cfg(feature = "nut13")] + #[error("`{0}`")] + Bip32(#[from] bip32::Error), + #[error("`{0}`")] ParseInt(#[from] std::num::ParseIntError), /// Custom error #[error("`{0}`")] diff --git a/crates/cashu/src/nuts/nut13.rs b/crates/cashu/src/nuts/nut13.rs index 429f6a14..f3ebf939 100644 --- a/crates/cashu/src/nuts/nut13.rs +++ b/crates/cashu/src/nuts/nut13.rs @@ -11,10 +11,9 @@ impl Secret { pub fn from_seed(mnemonic: &Mnemonic, keyset_id: Id, counter: u64) -> Result { let path = DerivationPath::from_str(&format!( "m/129372'/0'/{}'/{}'/0", - u64::try_from(keyset_id).unwrap(), + u64::try_from(keyset_id)?, counter - )) - .unwrap(); + ))?; let xpriv = XPrv::derive_from_path(mnemonic.to_seed(""), &path).unwrap(); @@ -26,12 +25,11 @@ impl SecretKey { pub fn from_seed(mnemonic: &Mnemonic, keyset_id: Id, counter: u64) -> Result { let path = DerivationPath::from_str(&format!( "m/129372'/0'/{}'/{}'/1", - u64::try_from(keyset_id).unwrap(), + u64::try_from(keyset_id)?, counter - )) - .unwrap(); + ))?; - let signing_key = XPrv::derive_from_path(mnemonic.to_seed(""), &path).unwrap(); + let signing_key = XPrv::derive_from_path(mnemonic.to_seed(""), &path)?; let private_key = signing_key.private_key();