@@ -5,7 +5,8 @@ use payjoin::bitcoin::consensus::encode::serialize_hex;
55use payjoin:: bitcoin:: psbt:: Psbt ;
66use payjoin:: bitcoin:: { Amount , FeeRate } ;
77use payjoin:: receive:: v2:: {
8- NewReceiver , PayjoinProposal , Receiver , UncheckedProposal , WithContext ,
8+ NewReceiver , PayjoinProposal , ProvisionalProposal , Receiver , UncheckedProposal , WantsInputs ,
9+ WithContext ,
910} ;
1011use payjoin:: receive:: { Error , ReplyableError } ;
1112use payjoin:: send:: v2:: { Sender , SenderBuilder } ;
@@ -243,8 +244,8 @@ impl App {
243244
244245 async fn long_poll_fallback (
245246 & self ,
246- session : & mut payjoin :: receive :: v2 :: Receiver < WithContext > ,
247- ) -> Result < payjoin :: receive :: v2 :: Receiver < UncheckedProposal > > {
247+ session : & mut Receiver < WithContext > ,
248+ ) -> Result < Receiver < UncheckedProposal > > {
248249 let ohttp_relay = self . unwrap_relay_or_else_fetch ( ) . await ?;
249250
250251 loop {
@@ -263,8 +264,8 @@ impl App {
263264
264265 fn process_v2_proposal (
265266 & self ,
266- proposal : payjoin :: receive :: v2 :: Receiver < UncheckedProposal > ,
267- ) -> Result < payjoin :: receive :: v2 :: Receiver < PayjoinProposal > , Error > {
267+ proposal : Receiver < UncheckedProposal > ,
268+ ) -> Result < Receiver < PayjoinProposal > , Error > {
268269 let wallet = self . wallet ( ) ;
269270
270271 // in a payment processor where the sender could go offline, this is where you schedule to broadcast the original_tx
@@ -342,12 +343,9 @@ async fn handle_recoverable_error(
342343}
343344
344345fn try_contributing_inputs (
345- payjoin : payjoin :: receive :: v2 :: Receiver < payjoin :: receive :: v2 :: WantsInputs > ,
346+ payjoin : Receiver < WantsInputs > ,
346347 wallet : & BitcoindWallet ,
347- ) -> Result <
348- payjoin:: receive:: v2:: Receiver < payjoin:: receive:: v2:: ProvisionalProposal > ,
349- ImplementationError ,
350- > {
348+ ) -> Result < Receiver < ProvisionalProposal > , ImplementationError > {
351349 let candidate_inputs = wallet. list_unspent ( ) ?;
352350
353351 let selected_input =
0 commit comments