@@ -245,10 +245,10 @@ Future<payjoin.ReceiveSession?> retrieve_receiver_proposal(
245245 var agent = http.Client ();
246246 var request = receiver.extractReq (ohttp_relay.asString ());
247247 var response = await agent.post (Uri .parse (request.request.url.asString ()),
248- headers: {"Content-Type" : request.request.contentType});
248+ headers: {"Content-Type" : request.request.contentType},
249+ body: request.request.body);
249250 var res = receiver
250- .processRes (Uint8List .fromList (utf8.encode (response.body)),
251- request.clientResponse)
251+ .processRes (response.bodyBytes, request.clientResponse)
252252 .save (recv_persister);
253253 if (res.isNone ()) {
254254 return null ;
@@ -262,45 +262,38 @@ Future<payjoin.ReceiveSession?> process_receiver_proposal(
262262 payjoin.ReceiveSession receiver,
263263 InMemoryReceiverPersister recv_persister,
264264 payjoin.Url ohttp_relay) async {
265- if (receiver is payjoin.Initialized ) {
265+ if (receiver is payjoin.InitializedReceiveSession ) {
266266 var res = await retrieve_receiver_proposal (
267- receiver as payjoin. Initialized , recv_persister, ohttp_relay);
267+ receiver.inner , recv_persister, ohttp_relay);
268268 if (res == null ) {
269269 return null ;
270270 }
271271 return res;
272272 }
273273
274- if (receiver is payjoin.UncheckedProposal ) {
275- return await process_unchecked_proposal (
276- receiver as payjoin.UncheckedProposal , recv_persister);
274+ if (receiver is payjoin.UncheckedProposalReceiveSession ) {
275+ return await process_unchecked_proposal (receiver.inner, recv_persister);
277276 }
278- if (receiver is payjoin.MaybeInputsOwned ) {
279- return await process_maybe_inputs_owned (
280- receiver as payjoin.MaybeInputsOwned , recv_persister);
277+ if (receiver is payjoin.MaybeInputsOwnedReceiveSession ) {
278+ return await process_maybe_inputs_owned (receiver.inner, recv_persister);
281279 }
282- if (receiver is payjoin.MaybeInputsSeen ) {
283- return await process_maybe_inputs_seen (
284- receiver as payjoin.MaybeInputsSeen , recv_persister);
280+ if (receiver is payjoin.MaybeInputsSeenReceiveSession ) {
281+ return await process_maybe_inputs_seen (receiver.inner, recv_persister);
285282 }
286- if (receiver is payjoin.OutputsUnknown ) {
287- return await process_outputs_unknown (
288- receiver as payjoin.OutputsUnknown , recv_persister);
283+ if (receiver is payjoin.OutputsUnknownReceiveSession ) {
284+ return await process_outputs_unknown (receiver.inner, recv_persister);
289285 }
290- if (receiver is payjoin.WantsOutputs ) {
291- return await process_wants_outputs (
292- receiver as payjoin.WantsOutputs , recv_persister);
286+ if (receiver is payjoin.WantsOutputsReceiveSession ) {
287+ return await process_wants_outputs (receiver.inner, recv_persister);
293288 }
294- if (receiver is payjoin.WantsInputs ) {
295- return await process_wants_inputs (
296- receiver as payjoin.WantsInputs , recv_persister);
289+ if (receiver is payjoin.WantsInputsReceiveSession ) {
290+ return await process_wants_inputs (receiver.inner, recv_persister);
297291 }
298- if (receiver is payjoin.ProvisionalProposal ) {
299- return await process_provisional_proposal (
300- receiver as payjoin.ProvisionalProposal , recv_persister);
292+ if (receiver is payjoin.ProvisionalProposalReceiveSession ) {
293+ return await process_provisional_proposal (receiver.inner, recv_persister);
301294 }
302- if (receiver is payjoin.PayjoinProposal ) {
303- return receiver as payjoin. PayjoinProposalReceiveSession ;
295+ if (receiver is payjoin.PayjoinProposalReceiveSession ) {
296+ return receiver;
304297 }
305298
306299 throw Exception ("Unknown receiver state: $receiver " );
@@ -330,9 +323,11 @@ void main() {
330323 var sender_persister = InMemorySenderPersister ("1" );
331324 var session = create_receiver_context (
332325 receiver_address, directory, ohttp_keys, recv_persister);
333- // var process_response = await process_receiver_proposal(
334- // session as payjoin.ReceiveSession, recv_persister, ohttp_relay);
335- // expect(process_response, isNull);
326+ var process_response = await process_receiver_proposal (
327+ payjoin.InitializedReceiveSession (session),
328+ recv_persister,
329+ ohttp_relay);
330+ expect (process_response, isNull);
336331
337332 // **********************
338333 // Inside the Sender:
0 commit comments