From 2c63263dc26615f3e48a773bf806b8b09f6922f0 Mon Sep 17 00:00:00 2001 From: thesimplekid Date: Sat, 25 Nov 2023 23:06:50 +0000 Subject: [PATCH] refactor: rename 'symbol' to 'unit' --- bindings/cashu-ffi/src/cashu.udl | 6 +++--- bindings/cashu-ffi/src/nuts/nut02/key_set.rs | 8 ++++---- bindings/cashu-ffi/src/nuts/nut02/mint_keyset.rs | 9 ++------- bindings/cashu-ffi/src/types/keyset_info.rs | 4 ++-- bindings/cashu-js/src/nuts/nut02/keyset.rs | 4 ++-- bindings/cashu-js/src/nuts/nut02/mint_keyset.rs | 4 ++-- bindings/cashu-sdk-ffi/src/cashu_sdk.udl | 8 ++++---- bindings/cashu-sdk-ffi/src/types/keyset_info.rs | 4 ++-- crates/cashu-sdk/src/mint.rs | 10 +++++----- crates/cashu/src/nuts/nut02.rs | 14 +++++++------- crates/cashu/src/types.rs | 4 ++-- 11 files changed, 35 insertions(+), 40 deletions(-) diff --git a/bindings/cashu-ffi/src/cashu.udl b/bindings/cashu-ffi/src/cashu.udl index 262c2274..f6334334 100644 --- a/bindings/cashu-ffi/src/cashu.udl +++ b/bindings/cashu-ffi/src/cashu.udl @@ -124,14 +124,14 @@ interface Keys { }; interface KeySet { - constructor(Id id, string symbol, Keys keys); + constructor(Id id, string unit, Keys keys); Id id(); Keys keys(); }; interface MintKeySet { [Name=generate] - constructor(string secret, string symbol, string derivation_path, u8 max_order); + constructor(string secret, string unit, string derivation_path, u8 max_order); }; @@ -246,7 +246,7 @@ interface MintInfo { }; interface KeySetInfo { - constructor(Id id, string symbol); + constructor(Id id, string unit); }; diff --git a/bindings/cashu-ffi/src/nuts/nut02/key_set.rs b/bindings/cashu-ffi/src/nuts/nut02/key_set.rs index 94e3a012..d179d19e 100644 --- a/bindings/cashu-ffi/src/nuts/nut02/key_set.rs +++ b/bindings/cashu-ffi/src/nuts/nut02/key_set.rs @@ -50,11 +50,11 @@ impl Deref for KeySet { } impl KeySet { - pub fn new(id: Arc, symbol: String, keys: Arc) -> Self { + pub fn new(id: Arc, unit: String, keys: Arc) -> Self { Self { inner: KeySetSdk { id: *id.as_ref().deref(), - symbol, + unit, keys: keys.as_ref().deref().clone(), }, } @@ -64,8 +64,8 @@ impl KeySet { Arc::new(self.inner.id.into()) } - pub fn symbol(&self) -> String { - self.inner.symbol.clone() + pub fn unit(&self) -> String { + self.inner.unit.clone() } pub fn keys(&self) -> Arc { diff --git a/bindings/cashu-ffi/src/nuts/nut02/mint_keyset.rs b/bindings/cashu-ffi/src/nuts/nut02/mint_keyset.rs index ce6c3ad9..fab9286a 100644 --- a/bindings/cashu-ffi/src/nuts/nut02/mint_keyset.rs +++ b/bindings/cashu-ffi/src/nuts/nut02/mint_keyset.rs @@ -14,14 +14,9 @@ impl Deref for MintKeySet { } impl MintKeySet { - pub fn generate( - secret: String, - symbol: String, - derivation_path: String, - max_order: u8, - ) -> Self { + pub fn generate(secret: String, unit: String, derivation_path: String, max_order: u8) -> Self { Self { - inner: KeySetSdk::generate(secret, symbol, derivation_path, max_order), + inner: KeySetSdk::generate(secret, unit, derivation_path, max_order), } } } diff --git a/bindings/cashu-ffi/src/types/keyset_info.rs b/bindings/cashu-ffi/src/types/keyset_info.rs index 3b6ac2d9..5b4b602d 100644 --- a/bindings/cashu-ffi/src/types/keyset_info.rs +++ b/bindings/cashu-ffi/src/types/keyset_info.rs @@ -23,11 +23,11 @@ impl From for KeySetInfo { } impl KeySetInfo { - pub fn new(id: Arc, symbol: String) -> Self { + pub fn new(id: Arc, unit: String) -> Self { Self { inner: KeySetInfoSdk { id: *id.as_ref().deref(), - symbol, + unit, }, } } diff --git a/bindings/cashu-js/src/nuts/nut02/keyset.rs b/bindings/cashu-js/src/nuts/nut02/keyset.rs index 886bd9d2..eea870ad 100644 --- a/bindings/cashu-js/src/nuts/nut02/keyset.rs +++ b/bindings/cashu-js/src/nuts/nut02/keyset.rs @@ -64,11 +64,11 @@ impl From for JsKeySet { impl JsKeySet { /// From Hex #[wasm_bindgen(constructor)] - pub fn new(id: JsId, symbol: String, keys: JsKeys) -> JsKeySet { + pub fn new(id: JsId, unit: String, keys: JsKeys) -> JsKeySet { Self { inner: KeySet { id: *id.deref(), - symbol, + unit, keys: keys.deref().clone(), }, } diff --git a/bindings/cashu-js/src/nuts/nut02/mint_keyset.rs b/bindings/cashu-js/src/nuts/nut02/mint_keyset.rs index 60862db5..1cd453c9 100644 --- a/bindings/cashu-js/src/nuts/nut02/mint_keyset.rs +++ b/bindings/cashu-js/src/nuts/nut02/mint_keyset.rs @@ -27,12 +27,12 @@ impl JsMintKeySet { #[wasm_bindgen(constructor)] pub fn generate( secret: String, - symbol: String, + unit: String, derivation_path: String, max_order: u8, ) -> JsMintKeySet { Self { - inner: KeySet::generate(secret, symbol, derivation_path, max_order), + inner: KeySet::generate(secret, unit, derivation_path, max_order), } } } diff --git a/bindings/cashu-sdk-ffi/src/cashu_sdk.udl b/bindings/cashu-sdk-ffi/src/cashu_sdk.udl index a32bb636..b8cfc9a9 100644 --- a/bindings/cashu-sdk-ffi/src/cashu_sdk.udl +++ b/bindings/cashu-sdk-ffi/src/cashu_sdk.udl @@ -127,7 +127,7 @@ interface Keys { }; interface KeySet { - constructor(Id id, string symbol, Keys keys); + constructor(Id id, string unit, Keys keys); Id id(); Keys keys(); }; @@ -135,7 +135,7 @@ interface KeySet { interface MintKeySet { [Name=generate] - constructor(string secret, string symbol, string derivation_path, u8 max_order); + constructor(string secret, string unit, string derivation_path, u8 max_order); }; @@ -264,14 +264,14 @@ interface ProofsStatus { interface KeySetInfo { - constructor(Id id, string symbol); + constructor(Id id, string unit); }; // Cashu Sdk interface MintKeySetInfo { - constructor(Id id, string symbol, u64 valid_from, u64? valid_to, string derivation_path, u8 max_order); + constructor(Id id, string unit, u64 valid_from, u64? valid_to, string derivation_path, u8 max_order); }; diff --git a/bindings/cashu-sdk-ffi/src/types/keyset_info.rs b/bindings/cashu-sdk-ffi/src/types/keyset_info.rs index 0b9c93da..ca178589 100644 --- a/bindings/cashu-sdk-ffi/src/types/keyset_info.rs +++ b/bindings/cashu-sdk-ffi/src/types/keyset_info.rs @@ -25,7 +25,7 @@ impl From for KeySetInfo { impl KeySetInfo { pub fn new( id: Arc, - symbol: String, + unit: String, valid_from: u64, valid_to: Option, derivation_path: String, @@ -34,7 +34,7 @@ impl KeySetInfo { Self { inner: KeySetInfoSdk { id: *id.as_ref().deref(), - symbol, + unit, valid_from, valid_to, derivation_path, diff --git a/crates/cashu-sdk/src/mint.rs b/crates/cashu-sdk/src/mint.rs index 344075cf..22d35d9a 100644 --- a/crates/cashu-sdk/src/mint.rs +++ b/crates/cashu-sdk/src/mint.rs @@ -35,7 +35,7 @@ impl Mint { ) -> Self { let active_keyset = nut02::mint::KeySet::generate( secret, - active_keyset_info.symbol.clone(), + active_keyset_info.unit.clone(), active_keyset_info.derivation_path.clone(), active_keyset_info.max_order, ); @@ -83,7 +83,7 @@ impl Mint { } self.inactive_keysets.get(id).map(|k| { - nut02::mint::KeySet::generate(&self.secret, &k.symbol, &k.derivation_path, k.max_order) + nut02::mint::KeySet::generate(&self.secret, &k.unit, &k.derivation_path, k.max_order) .into() }) } @@ -92,7 +92,7 @@ impl Mint { /// Generate new keyset pub fn rotate_keyset( &mut self, - symbol: impl Into, + unit: impl Into, derivation_path: impl Into, max_order: u8, ) { @@ -100,7 +100,7 @@ impl Mint { self.inactive_keysets .insert(self.active_keyset.id, self.active_keyset_info.clone()); - self.active_keyset = MintKeySet::generate(&self.secret, symbol, derivation_path, max_order); + self.active_keyset = MintKeySet::generate(&self.secret, unit, derivation_path, max_order); } pub fn process_mint_request( @@ -193,7 +193,7 @@ impl Mint { let keyset = if let Some(keyset) = self.inactive_keysets.get(&proof.id) { nut02::mint::KeySet::generate( &self.secret, - &keyset.symbol, + &keyset.unit, &keyset.derivation_path, keyset.max_order, ) diff --git a/crates/cashu/src/nuts/nut02.rs b/crates/cashu/src/nuts/nut02.rs index 7abe65e0..abcd20df 100644 --- a/crates/cashu/src/nuts/nut02.rs +++ b/crates/cashu/src/nuts/nut02.rs @@ -167,7 +167,7 @@ impl KeysetResponse { #[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)] pub struct KeySet { pub id: Id, - pub symbol: String, + pub unit: String, pub keys: Keys, } @@ -175,7 +175,7 @@ impl From for KeySet { fn from(keyset: mint::KeySet) -> Self { Self { id: keyset.id, - symbol: keyset.symbol, + unit: keyset.unit, keys: Keys::from(keyset.keys), } } @@ -184,14 +184,14 @@ impl From for KeySet { #[derive(Debug, Clone, Hash, PartialEq, Eq, Deserialize, Serialize)] pub struct KeySetInfo { pub id: Id, - pub symbol: String, + pub unit: String, } impl From for KeySetInfo { fn from(keyset: KeySet) -> KeySetInfo { Self { id: keyset.id, - symbol: keyset.symbol, + unit: keyset.unit, } } } @@ -211,14 +211,14 @@ pub mod mint { #[derive(Debug, Clone, PartialEq, Eq, Serialize)] pub struct KeySet { pub id: Id, - pub symbol: String, + pub unit: String, pub keys: Keys, } impl KeySet { pub fn generate( secret: impl Into, - symbol: impl Into, + unit: impl Into, derivation_path: impl Into, max_order: u8, ) -> Self { @@ -252,7 +252,7 @@ pub mod mint { Self { id: (&keys).into(), - symbol: symbol.into(), + unit: unit.into(), keys, } } diff --git a/crates/cashu/src/types.rs b/crates/cashu/src/types.rs index a654fb66..54877061 100644 --- a/crates/cashu/src/types.rs +++ b/crates/cashu/src/types.rs @@ -36,7 +36,7 @@ pub enum InvoiceStatus { #[derive(Debug, Hash, Clone, PartialEq, Eq, Serialize, Deserialize)] pub struct KeysetInfo { pub id: Id, - pub symbol: String, + pub unit: String, pub valid_from: u64, pub valid_to: Option, pub derivation_path: String, @@ -47,7 +47,7 @@ impl From for KeySetInfo { fn from(keyset_info: KeysetInfo) -> Self { Self { id: keyset_info.id, - symbol: keyset_info.symbol, + unit: keyset_info.unit, } } }