aljaz/cdk
1
0
Fork 0
mirror of https://github.com/aljazceru/cdk.git synced 2026-02-23 14:06:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

cashu-sdk improve: use Id type

Browse Source
This commit is contained in:
thesimplekid
2023-09-09 11:43:42 +01:00
parent 4e3268a7c7
commit 6cde1e7b22
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates/cashu-sdk/src/mint.rs
View File

@@ -7,6 +7,7 @@ use cashu::nuts::nut00::BlindedMessage;
use cashu::nuts::nut00::BlindedSignature;
use cashu::nuts::nut00::Proof;
use cashu::nuts::nut02::mint::KeySet;
use cashu::nuts::nut02::Id;
use cashu::nuts::nut06::SplitRequest;
use cashu::nuts::nut06::SplitResponse;
use cashu::nuts::nut07::CheckSpendableRequest;
@@ -20,7 +21,7 @@ use cashu::Amount;
pub struct Mint {
// pub pubkey: PublicKey,
pub active_keyset: nut02::mint::KeySet,
pub inactive_keysets: HashMap<String, nut02::mint::KeySet>,
pub inactive_keysets: HashMap<Id, nut02::mint::KeySet>,
pub spent_secrets: HashSet<Secret>,
pub pending_secrets: HashSet<Secret>,
}
@@ -29,7 +30,7 @@ impl Mint {
pub fn new(
secret: &str,
derivation_path: &str,
inactive_keysets: HashMap<String, nut02::mint::KeySet>,
inactive_keysets: HashMap<Id, nut02::mint::KeySet>,
spent_secrets: HashSet<Secret>,
max_order: u8,
) -> Self {
@@ -58,8 +59,8 @@ impl Mint {
self.active_keyset.clone()
}
pub fn keyset(&self, id: &str) -> Option<nut02::KeySet> {
if self.active_keyset.id == id {
pub fn keyset(&self, id: &Id) -> Option<nut02::KeySet> {
if self.active_keyset.id.eq(id) {
return Some(self.active_keyset.clone().into());
}

19
crates/cashu/src/nuts/nut00.rs
View File

@@ -8,6 +8,7 @@ use crate::{secret::Secret, serde_utils::serde_url};
use serde::{Deserialize, Serialize};
use super::nut01::PublicKey;
use super::nut02::Id;
/// Blinded Message [NUT-00]
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
@@ -182,7 +183,7 @@ impl MintProofs {
/// Promise (BlindedSignature) [NUT-00]
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
pub struct BlindedSignature {
pub id: String,
pub id: Id,
pub amount: Amount,
/// blinded signature (C_) on the secret message `B_` of [BlindedMessage]
#[serde(rename = "C_")]
@@ -200,7 +201,7 @@ pub struct Proof {
#[serde(rename = "C")]
pub c: PublicKey,
/// `Keyset id`
pub id: Option<String>,
pub id: Option<Id>,
}
/// List of proofs
@@ -220,7 +221,7 @@ impl From<Proof> for mint::Proof {
pub mod mint {
use serde::{Deserialize, Serialize};
use crate::{secret::Secret, Amount};
use crate::{nuts::nut02::Id, secret::Secret, Amount};
use super::PublicKey;
@@ -235,7 +236,7 @@ pub mod mint {
#[serde(rename = "C")]
pub c: Option<PublicKey>,
/// `Keyset id`
pub id: Option<String>,
pub id: Option<Id>,
}
/// List of proofs
@@ -259,7 +260,10 @@ mod tests {
let proof = "[{\"id\":\"DSAl9nvvyfva\",\"amount\":2,\"secret\":\"EhpennC9qB3iFlW8FZ_pZw\",\"C\":\"02c020067db727d586bc3183aecf97fcb800c3f4cc4759f69c626c9db5d8f5b5d4\"},{\"id\":\"DSAl9nvvyfva\",\"amount\":8,\"secret\":\"TmS6Cv0YT5PU_5ATVKnukw\",\"C\":\"02ac910bef28cbe5d7325415d5c263026f15f9b967a079ca9779ab6e5c2db133a7\"}]";
let proof: Proofs = serde_json::from_str(proof).unwrap();
assert_eq!(proof[0].clone().id.unwrap(), "DSAl9nvvyfva");
assert_eq!(
proof[0].clone().id.unwrap(),
Id::try_from_base64("DSAl9nvvyfva").unwrap()
);
}
#[test]
@@ -271,7 +275,10 @@ mod tests {
token.token[0].mint,
Url::from_str("https://8333.space:3338").unwrap()
);
assert_eq!(token.token[0].proofs[0].clone().id.unwrap(), "DSAl9nvvyfva");
assert_eq!(
token.token[0].proofs[0].clone().id.unwrap(),
Id::try_from_base64("DSAl9nvvyfva").unwrap()
);
let encoded = &token.convert_to_string().unwrap();