@@ -571,12 +571,14 @@ impl Builder {
571
571
route_handler : Arc :: clone ( & p2p_gossip_sync)
572
572
as Arc < dyn RoutingMessageHandler + Sync + Send > ,
573
573
onion_message_handler : onion_messenger,
574
+ custom_message_handler : IgnoringMessageHandler { } ,
574
575
} ,
575
576
GossipSync :: Rapid ( _) => MessageHandler {
576
577
chan_handler : Arc :: clone ( & channel_manager) ,
577
578
route_handler : Arc :: new ( IgnoringMessageHandler { } )
578
579
as Arc < dyn RoutingMessageHandler + Sync + Send > ,
579
580
onion_message_handler : onion_messenger,
581
+ custom_message_handler : IgnoringMessageHandler { } ,
580
582
} ,
581
583
GossipSync :: None => {
582
584
unreachable ! ( "We must always have a gossip sync!" ) ;
@@ -588,7 +590,6 @@ impl Builder {
588
590
cur_time. as_secs ( ) . try_into ( ) . expect ( "System time error" ) ,
589
591
& ephemeral_bytes,
590
592
Arc :: clone ( & logger) ,
591
- IgnoringMessageHandler { } ,
592
593
Arc :: clone ( & keys_manager) ,
593
594
) ) ;
594
595
@@ -1335,9 +1336,12 @@ impl Node {
1335
1336
invoice. min_final_cltv_expiry_delta ( ) as u32 ,
1336
1337
)
1337
1338
. with_expiry_time ( expiry_time. as_secs ( ) )
1338
- . with_route_hints ( invoice. route_hints ( ) ) ;
1339
+ . with_route_hints ( invoice. route_hints ( ) )
1340
+ . map_err ( |_| Error :: InvalidInvoice ) ?;
1339
1341
if let Some ( features) = invoice. features ( ) {
1340
- payment_params = payment_params. with_features ( features. clone ( ) ) ;
1342
+ payment_params = payment_params
1343
+ . with_bolt11_features ( features. clone ( ) )
1344
+ . map_err ( |_| Error :: InvalidInvoice ) ?;
1341
1345
}
1342
1346
let route_params = RouteParameters { payment_params, final_value_msat : amount_msat } ;
1343
1347
0 commit comments