11use std:: str:: FromStr ;
22
33use async_trait:: async_trait;
4+ use bcr_common:: KeysClient ;
5+ use bcr_common:: QuoteClient ;
6+ use bcr_common:: SwapClient ;
7+ use bcr_common:: wire:: quotes:: { ResolveOffer , StatusReply } ;
48use bcr_ebill_core:: {
59 SecretKey , ServiceTraitBounds ,
6- bill:: BillId ,
710 blockchain:: bill:: BillToShareWithExternalParty ,
811 util:: { BcrKeys , date:: DateTimeUtc } ,
912} ;
10- use bcr_wdc_key_client:: KeyClient ;
11- use bcr_wdc_quote_client:: QuoteClient ;
12- use bcr_wdc_swap_client:: SwapClient ;
13- use bcr_wdc_webapi:: quotes:: { ResolveOffer , StatusReply } ;
1413use cashu:: { ProofsMethods , State , nut01 as cdk01, nut02 as cdk02} ;
1514use thiserror:: Error ;
1615
@@ -135,23 +134,20 @@ impl MintClient {
135134 }
136135
137136 pub fn quote_client ( & self , mint_url : & str ) -> Result < QuoteClient > {
138- let quote_client = bcr_wdc_quote_client:: QuoteClient :: new (
139- reqwest:: Url :: parse ( mint_url) . map_err ( |_| Error :: InvalidMintUrl ) ?,
140- ) ;
137+ let quote_client =
138+ QuoteClient :: new ( reqwest:: Url :: parse ( mint_url) . map_err ( |_| Error :: InvalidMintUrl ) ?) ;
141139 Ok ( quote_client)
142140 }
143141
144- pub fn key_client ( & self , mint_url : & str ) -> Result < KeyClient > {
145- let key_client = bcr_wdc_key_client:: KeyClient :: new (
146- reqwest:: Url :: parse ( mint_url) . map_err ( |_| Error :: InvalidMintUrl ) ?,
147- ) ;
142+ pub fn key_client ( & self , mint_url : & str ) -> Result < KeysClient > {
143+ let key_client =
144+ KeysClient :: new ( reqwest:: Url :: parse ( mint_url) . map_err ( |_| Error :: InvalidMintUrl ) ?) ;
148145 Ok ( key_client)
149146 }
150147
151148 pub fn swap_client ( & self , mint_url : & str ) -> Result < SwapClient > {
152- let swap_client = bcr_wdc_swap_client:: SwapClient :: new (
153- reqwest:: Url :: parse ( mint_url) . map_err ( |_| Error :: InvalidMintUrl ) ?,
154- ) ;
149+ let swap_client =
150+ SwapClient :: new ( reqwest:: Url :: parse ( mint_url) . map_err ( |_| Error :: InvalidMintUrl ) ?) ;
155151 Ok ( swap_client)
156152 }
157153}
@@ -321,22 +317,38 @@ impl MintClientApi for MintClient {
321317 quote_id : & str ,
322318 resolve : ResolveMintOffer ,
323319 ) -> Result < ( ) > {
324- self . quote_client ( mint_url) ?
325- . resolve (
326- uuid:: Uuid :: from_str ( quote_id) . map_err ( |_| Error :: InvalidMintRequestId ) ?,
327- resolve. into ( ) ,
328- )
329- . await
330- . map_err ( |e| {
331- log:: error!( "Error resolving request on mint {mint_url}: {e}" ) ;
332- Error :: QuoteClient
333- } ) ?;
320+ match resolve {
321+ ResolveMintOffer :: Accept => {
322+ self . quote_client ( mint_url) ?
323+ . accept_offer (
324+ uuid:: Uuid :: from_str ( quote_id) . map_err ( |_| Error :: InvalidMintRequestId ) ?,
325+ )
326+ . await
327+ . map_err ( |e| {
328+ log:: error!( "Error accepting request on mint {mint_url}: {e}" ) ;
329+ Error :: QuoteClient
330+ } ) ?;
331+ }
332+ ResolveMintOffer :: Reject => {
333+ self . quote_client ( mint_url) ?
334+ . reject_offer (
335+ uuid:: Uuid :: from_str ( quote_id) . map_err ( |_| Error :: InvalidMintRequestId ) ?,
336+ )
337+ . await
338+ . map_err ( |e| {
339+ log:: error!( "Error rejecting request on mint {mint_url}: {e}" ) ;
340+ Error :: QuoteClient
341+ } ) ?;
342+ }
343+ } ;
334344 Ok ( ( ) )
335345 }
336346
337347 async fn cancel_quote_for_mint ( & self , mint_url : & str , quote_id : & str ) -> Result < ( ) > {
338348 self . quote_client ( mint_url) ?
339- . cancel ( uuid:: Uuid :: from_str ( quote_id) . map_err ( |_| Error :: InvalidMintRequestId ) ?)
349+ . cancel_enquiry (
350+ uuid:: Uuid :: from_str ( quote_id) . map_err ( |_| Error :: InvalidMintRequestId ) ?,
351+ )
340352 . await
341353 . map_err ( |e| {
342354 log:: error!( "Error cancelling request on mint {mint_url}: {e}" ) ;
@@ -432,6 +444,7 @@ impl From<StatusReply> for QuoteStatusReply {
432444 keyset_id,
433445 expiration_date,
434446 discounted,
447+ ..
435448 } => QuoteStatusReply :: Offered {
436449 keyset_id,
437450 expiration_date,
@@ -447,17 +460,13 @@ impl From<StatusReply> for QuoteStatusReply {
447460
448461fn map_shared_bill (
449462 bill_to_share : BillToShareWithExternalParty ,
450- ) -> bcr_wdc_webapi :: quotes:: SharedBill {
451- bcr_wdc_webapi :: quotes:: SharedBill {
452- bill_id : map_bill_id ( bill_to_share. bill_id ) ,
463+ ) -> bcr_common :: wire :: quotes:: SharedBill {
464+ bcr_common :: wire :: quotes:: SharedBill {
465+ bill_id : bill_to_share. bill_id ,
453466 data : bill_to_share. data ,
454467 file_urls : bill_to_share. file_urls ,
455468 hash : bill_to_share. hash ,
456469 signature : bill_to_share. signature ,
457- receiver : bill_to_share. receiver ,
470+ receiver : bill_to_share. receiver . into ( ) ,
458471 }
459472}
460-
461- fn map_bill_id ( bill_id : BillId ) -> bcr_wdc_webapi:: bill:: BillId {
462- bcr_wdc_webapi:: bill:: BillId :: from_str ( & bill_id. to_string ( ) ) . expect ( "is a bill id" )
463- }
0 commit comments