@@ -313,29 +313,27 @@ tests.push(async () => {
313313
314314 var a_handled_msg = false ;
315315 const om_handler_a = ldk . CustomOnionMessageHandler . new_impl ( {
316- read_custom_message ( message_type : bigint , buffer : Uint8Array ) : ldk . Result_COption_CustomOnionMessageContentsZDecodeErrorZ {
316+ read_custom_message ( message_type : bigint , buffer : Uint8Array ) : ldk . Result_COption_OnionMessageContentsZDecodeErrorZ {
317317 assert ( message_type == 4343n ) ;
318318 assert ( buffer . length == 44 ) ;
319319 for ( var i = 0 ; i < 44 ; i ++ ) assert ( buffer [ i ] == 67 ) ;
320- return ldk . Result_COption_CustomOnionMessageContentsZDecodeErrorZ . constructor_ok ( ldk . Option_CustomOnionMessageContentsZ . constructor_some ( ldk . CustomOnionMessageContents . new_impl ( {
320+ return ldk . Result_COption_OnionMessageContentsZDecodeErrorZ . constructor_ok ( ldk . Option_OnionMessageContentsZ . constructor_some ( ldk . OnionMessageContents . new_impl ( {
321321 tlv_type ( ) : bigint { return 9998n ; } ,
322322 write ( ) : Uint8Array { throw new Error ( ) ; }
323- } as ldk . CustomOnionMessageContentsInterface ) ) ) ;
323+ } as ldk . OnionMessageContentsInterface ) ) ) ;
324324 } ,
325- handle_custom_message ( msg : ldk . CustomOnionMessageContents ) {
325+ handle_custom_message ( msg : ldk . OnionMessageContents ) {
326326 assert ( msg . tlv_type ( ) == 9998n ) ;
327327 a_handled_msg = true ;
328328 } ,
329+ release_pending_custom_messages ( ) : ldk . ThreeTuple_OnionMessageContentsDestinationBlindedPathZ [ ] {
330+ return [ ] ;
331+ } ,
329332 } as ldk . CustomOnionMessageHandlerInterface ) ;
330333
331334 const underlying_om_a = ldk . OnionMessenger . constructor_new ( a . keys_manager . as_EntropySource ( ) ,
332335 a . keys_manager . as_NodeSigner ( ) , a . logger , ldk . DefaultMessageRouter . constructor_new ( ) . as_MessageRouter ( ) ,
333336 ignorer . as_OffersMessageHandler ( ) , om_handler_a ) ;
334- const om_provider_a = {
335- next_onion_message_for_peer ( peer_node_id : Uint8Array ) : ldk . OnionMessage {
336- return underlying_om_a . as_OnionMessageProvider ( ) . next_onion_message_for_peer ( peer_node_id ) ;
337- }
338- } as ldk . OnionMessageProviderInterface ;
339337 const om_a = ldk . OnionMessageHandler . new_impl ( {
340338 handle_onion_message ( peer_node_id : Uint8Array , msg : ldk . OnionMessage ) {
341339 underlying_om_a . as_OnionMessageHandler ( ) . handle_onion_message ( peer_node_id , msg ) ;
@@ -351,24 +349,30 @@ tests.push(async () => {
351349 } ,
352350 provided_init_features ( their_node_id : Uint8Array ) : ldk . InitFeatures {
353351 return underlying_om_a . as_OnionMessageHandler ( ) . provided_init_features ( their_node_id ) ;
354- }
355- } as ldk . OnionMessageHandlerInterface , om_provider_a ) ;
352+ } ,
353+ next_onion_message_for_peer ( peer_node_id : Uint8Array ) : ldk . OnionMessage {
354+ return underlying_om_a . as_OnionMessageHandler ( ) . next_onion_message_for_peer ( peer_node_id ) ;
355+ } ,
356+ } as ldk . OnionMessageHandlerInterface ) ;
356357
357358 var b_handled_msg = false ;
358359 const om_handler_b = ldk . CustomOnionMessageHandler . new_impl ( {
359- read_custom_message ( message_type : bigint , buffer : Uint8Array ) : ldk . Result_COption_CustomOnionMessageContentsZDecodeErrorZ {
360+ read_custom_message ( message_type : bigint , buffer : Uint8Array ) : ldk . Result_COption_OnionMessageContentsZDecodeErrorZ {
360361 assert ( message_type == 4242n ) ;
361362 assert ( buffer . length == 43 ) ;
362363 for ( var i = 0 ; i < 43 ; i ++ ) assert ( buffer [ i ] == 66 ) ;
363- return ldk . Result_COption_CustomOnionMessageContentsZDecodeErrorZ . constructor_ok ( ldk . Option_CustomOnionMessageContentsZ . constructor_some ( ldk . CustomOnionMessageContents . new_impl ( {
364+ return ldk . Result_COption_OnionMessageContentsZDecodeErrorZ . constructor_ok ( ldk . Option_OnionMessageContentsZ . constructor_some ( ldk . OnionMessageContents . new_impl ( {
364365 tlv_type ( ) : bigint { return 9999n ; } ,
365366 write ( ) : Uint8Array { throw new Error ( ) ; }
366- } as ldk . CustomOnionMessageContentsInterface ) ) ) ;
367+ } as ldk . OnionMessageContentsInterface ) ) ) ;
367368 } ,
368- handle_custom_message ( msg : ldk . CustomOnionMessageContents ) {
369+ handle_custom_message ( msg : ldk . OnionMessageContents ) {
369370 assert ( msg . tlv_type ( ) == 9999n ) ;
370371 b_handled_msg = true ;
371372 } ,
373+ release_pending_custom_messages ( ) : ldk . ThreeTuple_OnionMessageContentsDestinationBlindedPathZ [ ] {
374+ return [ ] ;
375+ }
372376 } as ldk . CustomOnionMessageHandlerInterface ) ;
373377 const om_b = ldk . OnionMessenger . constructor_new ( b . keys_manager . as_EntropySource ( ) , b . keys_manager . as_NodeSigner ( ) ,
374378 b . logger , ldk . DefaultMessageRouter . constructor_new ( ) . as_MessageRouter ( ) , ignorer . as_OffersMessageHandler ( ) ,
@@ -433,27 +437,27 @@ tests.push(async () => {
433437
434438 underlying_om_a . send_onion_message (
435439 ldk . OnionMessagePath . constructor_new ( [ ] , ldk . Destination . constructor_node ( b . node_id ) ) ,
436- ldk . OnionMessageContents . constructor_custom ( ldk . CustomOnionMessageContents . new_impl ( {
440+ ldk . OnionMessageContents . new_impl ( {
437441 tlv_type ( ) : bigint { return 4242n ; } ,
438442 write ( ) : Uint8Array {
439443 const ret = new Uint8Array ( 43 ) ;
440444 for ( var i = 0 ; i < 43 ; i ++ ) ret [ i ] = 66 ;
441445 return ret ;
442446 }
443- } as ldk . CustomOnionMessageContentsInterface ) ) , null ) ;
447+ } as ldk . OnionMessageContentsInterface ) , null ) ;
444448 pm_a . process_events ( ) ;
445449 assert ( b_handled_msg ) ;
446450
447451 om_b . send_onion_message (
448452 ldk . OnionMessagePath . constructor_new ( [ ] , ldk . Destination . constructor_node ( a . node_id ) ) ,
449- ldk . OnionMessageContents . constructor_custom ( ldk . CustomOnionMessageContents . new_impl ( {
453+ ldk . OnionMessageContents . new_impl ( {
450454 tlv_type ( ) : bigint { return 4343n ; } ,
451455 write ( ) : Uint8Array {
452456 const ret = new Uint8Array ( 44 ) ;
453457 for ( var i = 0 ; i < 44 ; i ++ ) ret [ i ] = 67 ;
454458 return ret ;
455459 }
456- } as ldk . CustomOnionMessageContentsInterface ) ) , null ) ;
460+ } as ldk . OnionMessageContentsInterface ) , null ) ;
457461 pm_b . process_events ( ) ;
458462 assert ( a_handled_msg ) ;
459463
0 commit comments