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

feat: use BTreeMap for wallet list

Browse Source
This commit is contained in:
thesimplekid
2024-08-24 09:48:38 +03:00
parent 4b3eca23e9
commit 9a009ef125
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/cdk-cli/src/sub_commands/balance.rs
View File

@@ -1,4 +1,4 @@
use std::collections::HashMap;
use std::collections::BTreeMap;
use anyhow::Result;
use cdk::mint_url::MintUrl;
@@ -15,9 +15,9 @@ pub async fn mint_balances(
multi_mint_wallet: &MultiMintWallet,
unit: &CurrencyUnit,
) -> Result<Vec<(MintUrl, Amount)>> {
let wallets: HashMap<MintUrl, Amount> = multi_mint_wallet.get_balances(unit).await?;
let wallets: BTreeMap<MintUrl, Amount> = multi_mint_wallet.get_balances(unit).await?;
let mut wallets_vec = Vec::with_capacity(wallets.capacity());
let mut wallets_vec = Vec::with_capacity(wallets.len());
for (i, (mint_url, amount)) in wallets.iter().enumerate() {
let mint_url = mint_url.clone();

2
crates/cdk/src/nuts/nut00/mod.rs
View File

@@ -312,7 +312,7 @@ where
}
/// Currency Unit
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Hash)]
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord, Default)]
pub enum CurrencyUnit {
/// Sat
#[default]

10
crates/cdk/src/wallet/multi_mint_wallet.rs
View File

@@ -2,7 +2,7 @@
//!
//! Wrapper around core [`Wallet`] that enables the use of multiple mint unit pairs
use std::collections::HashMap;
use std::collections::{BTreeMap, HashMap};
use std::fmt;
use std::str::FromStr;
use std::sync::Arc;
@@ -24,11 +24,11 @@ use crate::{Amount, Wallet};
#[derive(Debug, Clone)]
pub struct MultiMintWallet {
/// Wallets
pub wallets: Arc<Mutex<HashMap<WalletKey, Wallet>>>,
pub wallets: Arc<Mutex<BTreeMap<WalletKey, Wallet>>>,
}
/// Wallet Key
#[derive(Debug, Clone, Hash, PartialEq, Eq, Serialize, Deserialize)]
#[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
pub struct WalletKey {
mint_url: MintUrl,
unit: CurrencyUnit,
@@ -103,8 +103,8 @@ impl MultiMintWallet {
pub async fn get_balances(
&self,
unit: &CurrencyUnit,
) -> Result<HashMap<MintUrl, Amount>, Error> {
let mut balances = HashMap::new();
) -> Result<BTreeMap<MintUrl, Amount>, Error> {
let mut balances = BTreeMap::new();
for (WalletKey { mint_url, unit: u }, wallet) in self.wallets.lock().await.iter() {
if unit == u {