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

improve: impl 'to_string()' on 'Token'

Browse Source
This commit is contained in:
thesimplekid
2023-12-03 18:29:15 +00:00
parent ce0ff46885
commit e93fb506af
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bindings/cashu-ffi/src/nuts/nut00/token.rs
View File

@@ -45,7 +45,7 @@ impl Token {
}
pub fn as_string(&self) -> Result<String> {
Ok(self.inner.convert_to_string()?)
Ok(self.inner.to_string())
}
}

4
bindings/cashu-js/src/nuts/nut00/token.rs
View File

@@ -57,7 +57,7 @@ impl JsToken {
/// As String
#[wasm_bindgen(js_name = asString)]
pub fn as_string(&self) -> Result<String> {
self.inner.convert_to_string().map_err(into_err)
pub fn as_string(&self) -> String {
self.inner.to_string()
}
}

2
crates/cashu-sdk/src/wallet.rs
View File

@@ -340,7 +340,7 @@ impl<C: Client> Wallet<C> {
unit: Option<String>,
memo: Option<String>,
) -> Result<String, Error> {
Ok(Token::new(self.mint_url.clone(), proofs, unit, memo)?.convert_to_string()?)
Ok(Token::new(self.mint_url.clone(), proofs, unit, memo)?.to_string())
}
}

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

@@ -23,6 +23,7 @@ pub struct BlindedMessage {
#[cfg(feature = "wallet")]
pub mod wallet {
use std::cmp::Ordering;
use std::fmt;
use std::str::FromStr;
use base64::engine::{general_purpose, GeneralPurpose};
@@ -201,7 +202,6 @@ pub mod wallet {
#[serde(skip_serializing_if = "Option::is_none")]
pub memo: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
/// Unit of the token eg: sats, usd
pub unit: Option<String>,
}
@@ -209,8 +209,8 @@ pub mod wallet {
pub fn new(
mint_url: UncheckedUrl,
proofs: Proofs,
unit: Option<String>,
memo: Option<String>,
unit: Option<String>,
) -> Result<Self, wallet::Error> {
if proofs.is_empty() {
return Err(wallet::Error::ProofsRequired);
@@ -257,11 +257,11 @@ pub mod wallet {
}
}
impl Token {
pub fn convert_to_string(&self) -> Result<String, wallet::Error> {
let json_string = serde_json::to_string(self)?;
impl fmt::Display for Token {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let json_string = serde_json::to_string(self).map_err(|_| fmt::Error)?;
let encoded = general_purpose::STANDARD.encode(json_string);
Ok(format!("cashuA{}", encoded))
write!(f, "cashuA{}", encoded)
}
}
}
@@ -389,7 +389,7 @@ mod tests {
Id::from_str("DSAl9nvvyfva").unwrap()
);
let encoded = &token.convert_to_string().unwrap();
let encoded = &token.to_string();
let token_data = Token::from_str(encoded).unwrap();
@@ -408,7 +408,7 @@ mod tests {
)
.unwrap();
let _token = Token::from_str(&token.convert_to_string().unwrap()).unwrap();
let _token = Token::from_str(&token.to_string()).unwrap();
let _token = Token::from_str("cashuAeyJ0b2tlbiI6W3sicHJvb2ZzIjpbeyJpZCI6IjBOSTNUVUFzMVNmeSIsImFtb3VudCI6MSwic2VjcmV0IjoiVE92cGVmZGxSZ0EzdlhMN05pM2MvRE1oY29URXNQdnV4eFc0Rys2dXVycz0iLCJDIjoiMDNiZThmMzQwOTMxYTI4ZTlkMGRmNGFmMWQwMWY1ZTcxNTFkMmQ1M2RiN2Y0ZDAyMWQzZGUwZmRiMDNjZGY4ZTlkIn1dLCJtaW50IjoiaHR0cHM6Ly9sZWdlbmQubG5iaXRzLmNvbS9jYXNodS9hcGkvdjEvNGdyOVhjbXozWEVrVU53aUJpUUdvQyJ9XX0").unwrap();
}