@@ -576,12 +576,14 @@ impl Builder {
576
576
route_handler : Arc :: clone ( & p2p_gossip_sync)
577
577
as Arc < dyn RoutingMessageHandler + Sync + Send > ,
578
578
onion_message_handler : onion_messenger,
579
+ custom_message_handler : IgnoringMessageHandler { } ,
579
580
} ,
580
581
GossipSync :: Rapid ( _) => MessageHandler {
581
582
chan_handler : Arc :: clone ( & channel_manager) ,
582
583
route_handler : Arc :: new ( IgnoringMessageHandler { } )
583
584
as Arc < dyn RoutingMessageHandler + Sync + Send > ,
584
585
onion_message_handler : onion_messenger,
586
+ custom_message_handler : IgnoringMessageHandler { } ,
585
587
} ,
586
588
GossipSync :: None => {
587
589
unreachable ! ( "We must always have a gossip sync!" ) ;
@@ -593,7 +595,6 @@ impl Builder {
593
595
cur_time. as_secs ( ) . try_into ( ) . expect ( "System time error" ) ,
594
596
& ephemeral_bytes,
595
597
Arc :: clone ( & logger) ,
596
- IgnoringMessageHandler { } ,
597
598
Arc :: clone ( & keys_manager) ,
598
599
) ) ;
599
600
@@ -1385,9 +1386,12 @@ impl Node {
1385
1386
invoice. min_final_cltv_expiry_delta ( ) as u32 ,
1386
1387
)
1387
1388
. with_expiry_time ( expiry_time. as_secs ( ) )
1388
- . with_route_hints ( invoice. route_hints ( ) ) ;
1389
+ . with_route_hints ( invoice. route_hints ( ) )
1390
+ . map_err ( |_| Error :: InvalidInvoice ) ?;
1389
1391
if let Some ( features) = invoice. features ( ) {
1390
- payment_params = payment_params. with_features ( features. clone ( ) ) ;
1392
+ payment_params = payment_params
1393
+ . with_bolt11_features ( features. clone ( ) )
1394
+ . map_err ( |_| Error :: InvalidInvoice ) ?;
1391
1395
}
1392
1396
let route_params = RouteParameters { payment_params, final_value_msat : amount_msat } ;
1393
1397
0 commit comments