aljaz/cdk
1
0
Fork 0
mirror of https://github.com/aljazceru/cdk.git synced 2025-12-20 14:14:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: new struct 'MintUrl' which trims trailing slashes (#283)

Browse Source 
https://github.com/cashubtc/nuts/pull/151/files
This commit is contained in:
Caleb Beery
2024-08-12 12:32:44 -07:00
committed by GitHub
parent e57c7f1e9d
commit 40554987e1
28 changed files with 385 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/cdk-sqlite/src/mint/migrations/20240811031111_update_mint_url.sql Normal file
View File

@@ -0,0 +1 @@
UPDATE `mint_quote` SET `mint_url` = RTRIM(`mint_url`, '/');

21
crates/cdk-sqlite/src/wallet/migrations/20240810233905_update_mint_url.sql Normal file
View File

@@ -0,0 +1,21 @@
-- Delete duplicates from `mint`
DELETE FROM `mint`
WHERE `mint_url` IN (
SELECT `mint_url`
FROM (
SELECT RTRIM(`mint_url`, '/') AS trimmed_url, MIN(rowid) AS keep_id
FROM `mint`
GROUP BY trimmed_url
HAVING COUNT(*) > 1
)
)
AND rowid NOT IN (
SELECT MIN(rowid)
FROM `mint`
GROUP BY RTRIM(`mint_url`, '/')
);
UPDATE `mint` SET `mint_url` = RTRIM(`mint_url`, '/');
UPDATE `keyset` SET `mint_url` = RTRIM(`mint_url`, '/');
UPDATE `mint_quote` SET `mint_url` = RTRIM(`mint_url`, '/');
UPDATE `proof` SET `mint_url` = RTRIM(`mint_url`, '/');

20
crates/cdk-sqlite/src/wallet/mod.rs
View File

@@ -7,13 +7,13 @@ use std::str::FromStr;
use async_trait::async_trait;
use cdk::amount::Amount;
use cdk::cdk_database::{self, WalletDatabase};
use cdk::mint_url::MintUrl;
use cdk::nuts::{
CurrencyUnit, Id, KeySetInfo, Keys, MeltQuoteState, MintInfo, MintQuoteState, Proof, Proofs,
PublicKey, SpendingConditions, State,
};
use cdk::secret::Secret;
use cdk::types::ProofInfo;
use cdk::url::UncheckedUrl;
use cdk::wallet;
use cdk::wallet::MintQuote;
use error::Error;
@@ -62,7 +62,7 @@ impl WalletDatabase for WalletSqliteDatabase {
#[instrument(skip(self, mint_info))]
async fn add_mint(
&self,
mint_url: UncheckedUrl,
mint_url: MintUrl,
mint_info: Option<MintInfo>,
) -> Result<(), Self::Err> {
let (
@@ -129,7 +129,7 @@ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
}
#[instrument(skip(self))]
async fn remove_mint(&self, mint_url: UncheckedUrl) -> Result<(), Self::Err> {
async fn remove_mint(&self, mint_url: MintUrl) -> Result<(), Self::Err> {
sqlx::query(
r#"
DELETE FROM mint
@@ -145,7 +145,7 @@ WHERE mint_url=?
}
#[instrument(skip(self))]
async fn get_mint(&self, mint_url: UncheckedUrl) -> Result<Option<MintInfo>, Self::Err> {
async fn get_mint(&self, mint_url: MintUrl) -> Result<Option<MintInfo>, Self::Err> {
let rec = sqlx::query(
r#"
SELECT *
@@ -169,7 +169,7 @@ WHERE mint_url=?;
}
#[instrument(skip(self))]
async fn get_mints(&self) -> Result<HashMap<UncheckedUrl, Option<MintInfo>>, Self::Err> {
async fn get_mints(&self) -> Result<HashMap<MintUrl, Option<MintInfo>>, Self::Err> {
let rec = sqlx::query(
r#"
SELECT *
@@ -197,8 +197,8 @@ FROM mint
#[instrument(skip(self))]
async fn update_mint_url(
&self,
old_mint_url: UncheckedUrl,
new_mint_url: UncheckedUrl,
old_mint_url: MintUrl,
new_mint_url: MintUrl,
) -> Result<(), Self::Err> {
let tables = ["mint_quote", "proof"];
for table in &tables {
@@ -224,7 +224,7 @@ FROM mint
#[instrument(skip(self, keysets))]
async fn add_mint_keysets(
&self,
mint_url: UncheckedUrl,
mint_url: MintUrl,
keysets: Vec<KeySetInfo>,
) -> Result<(), Self::Err> {
for keyset in keysets {
@@ -251,7 +251,7 @@ VALUES (?, ?, ?, ?, ?);
#[instrument(skip(self))]
async fn get_mint_keysets(
&self,
mint_url: UncheckedUrl,
mint_url: MintUrl,
) -> Result<Option<Vec<KeySetInfo>>, Self::Err> {
let recs = sqlx::query(
r#"
@@ -547,7 +547,7 @@ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
#[instrument(skip(self, state, spending_conditions))]
async fn get_proofs(
&self,
mint_url: Option<UncheckedUrl>,
mint_url: Option<MintUrl>,
unit: Option<CurrencyUnit>,
state: Option<Vec<State>>,
spending_conditions: Option<Vec<SpendingConditions>>,