Skip to content

Commit

Permalink
Fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
davidcaseria committed Oct 28, 2024
1 parent dac9845 commit c7517b9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
7 changes: 1 addition & 6 deletions crates/cdk-nostr/src/zap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,17 +134,12 @@ impl NutZapper {
false,
)
.await?;
let proofs = token
.proofs()
.get(&mint_url)
.ok_or(Error::MissingProofs)?
.clone();
send_zap_proofs(
&self.client,
pubkey,
mint_url,
unit,
proofs,
token.proofs(),
content,
zapped_event_id,
)
Expand Down
9 changes: 1 addition & 8 deletions crates/cdk/src/mint/melt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,10 @@ use anyhow::bail;
use lightning_invoice::Bolt11Invoice;
use tracing::instrument;

use crate::cdk_lightning;
use crate::cdk_lightning::MintLightning;
use crate::cdk_lightning::PayInvoiceResponse;
use crate::nuts::nut00::ProofsMethods;
use crate::nuts::nut11::enforce_sig_flag;
use crate::nuts::nut11::EnforceSigFlag;
use crate::{
amount::to_unit,
cdk_lightning::{self, MintLightning, PayInvoiceResponse},
dhke::hash_to_curve,
mint::SigFlag,
mint::{nut00::ProofsMethods, SigFlag},
nuts::{
nut11::{enforce_sig_flag, EnforceSigFlag},
Id, MeltQuoteState,
Expand Down

0 comments on commit c7517b9

Please sign in to comment.