@@ -38,14 +38,14 @@ use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,Ig
38
38
use lightning:: ln:: msgs:: DecodeError ;
39
39
use lightning:: ln:: script:: ShutdownScript ;
40
40
use lightning:: routing:: network_graph:: { NetGraphMsgHandler , NetworkGraph } ;
41
- use lightning:: routing:: router:: { find_route, Payee , RouteParameters } ;
42
- use lightning:: routing:: scoring:: Scorer ;
41
+ use lightning:: routing:: router:: { find_route, PaymentParameters , RouteParameters } ;
42
+ use lightning:: routing:: scoring:: FixedPenaltyScorer ;
43
43
use lightning:: util:: config:: UserConfig ;
44
44
use lightning:: util:: errors:: APIError ;
45
45
use lightning:: util:: events:: Event ;
46
46
use lightning:: util:: enforcing_trait_impls:: { EnforcingSigner , EnforcementState } ;
47
47
use lightning:: util:: logger:: Logger ;
48
- use lightning:: util:: ser:: Readable ;
48
+ use lightning:: util:: ser:: ReadableArgs ;
49
49
50
50
use utils:: test_logger;
51
51
use utils:: test_persister:: TestPersister ;
@@ -60,6 +60,7 @@ use std::convert::TryInto;
60
60
use std:: cmp;
61
61
use std:: sync:: { Arc , Mutex } ;
62
62
use std:: sync:: atomic:: { AtomicU64 , AtomicUsize , Ordering } ;
63
+ use bitcoin:: bech32:: u5;
63
64
64
65
#[ inline]
65
66
pub fn slice_to_be16 ( v : & [ u8 ] ) -> u16 {
@@ -292,6 +293,7 @@ impl KeysInterface for KeyProvider {
292
293
EnforcingSigner :: new ( if inbound {
293
294
InMemorySigner :: new (
294
295
& secp_ctx,
296
+ self . node_secret . clone ( ) ,
295
297
SecretKey :: from_slice ( & [ 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , ctr] ) . unwrap ( ) ,
296
298
SecretKey :: from_slice ( & [ 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 2 , ctr] ) . unwrap ( ) ,
297
299
SecretKey :: from_slice ( & [ 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 3 , ctr] ) . unwrap ( ) ,
@@ -304,6 +306,7 @@ impl KeysInterface for KeyProvider {
304
306
} else {
305
307
InMemorySigner :: new (
306
308
& secp_ctx,
309
+ self . node_secret . clone ( ) ,
307
310
SecretKey :: from_slice ( & [ 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 7 , ctr] ) . unwrap ( ) ,
308
311
SecretKey :: from_slice ( & [ 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 8 , ctr] ) . unwrap ( ) ,
309
312
SecretKey :: from_slice ( & [ 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 9 , ctr] ) . unwrap ( ) ,
@@ -323,7 +326,7 @@ impl KeysInterface for KeyProvider {
323
326
}
324
327
325
328
fn read_chan_signer ( & self , mut data : & [ u8 ] ) -> Result < EnforcingSigner , DecodeError > {
326
- let inner: InMemorySigner = Readable :: read ( & mut data) ?;
329
+ let inner: InMemorySigner = ReadableArgs :: read ( & mut data, self . node_secret . clone ( ) ) ?;
327
330
let state = Arc :: new ( Mutex :: new ( EnforcementState :: new ( ) ) ) ;
328
331
329
332
Ok ( EnforcingSigner :: new_with_revoked (
@@ -333,7 +336,7 @@ impl KeysInterface for KeyProvider {
333
336
) )
334
337
}
335
338
336
- fn sign_invoice ( & self , _invoice_preimage : Vec < u8 > ) -> Result < RecoverableSignature , ( ) > {
339
+ fn sign_invoice ( & self , _hrp_bytes : & [ u8 ] , _invoice_data : & [ u5 ] ) -> Result < RecoverableSignature , ( ) > {
337
340
unreachable ! ( )
338
341
}
339
342
}
@@ -390,7 +393,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
390
393
let our_id = PublicKey :: from_secret_key ( & Secp256k1 :: signing_only ( ) , & keys_manager. get_node_secret ( ) ) ;
391
394
let network_graph = Arc :: new ( NetworkGraph :: new ( genesis_block ( network) . block_hash ( ) ) ) ;
392
395
let net_graph_msg_handler = Arc :: new ( NetGraphMsgHandler :: new ( Arc :: clone ( & network_graph) , None , Arc :: clone ( & logger) ) ) ;
393
- let scorer = Scorer :: with_fixed_penalty ( 0 ) ;
396
+ let scorer = FixedPenaltyScorer :: with_penalty ( 0 ) ;
394
397
395
398
let peers = RefCell :: new ( [ false ; 256 ] ) ;
396
399
let mut loss_detector = MoneyLossDetector :: new ( & peers, channelmanager. clone ( ) , monitor. clone ( ) , PeerManager :: new ( MessageHandler {
@@ -446,9 +449,9 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
446
449
} ,
447
450
4 => {
448
451
let final_value_msat = slice_to_be24 ( get_slice ! ( 3 ) ) as u64 ;
449
- let payee = Payee :: from_node_id ( get_pubkey ! ( ) ) ;
452
+ let payment_params = PaymentParameters :: from_node_id ( get_pubkey ! ( ) ) ;
450
453
let params = RouteParameters {
451
- payee ,
454
+ payment_params ,
452
455
final_value_msat,
453
456
final_cltv_expiry_delta : 42 ,
454
457
} ;
@@ -469,9 +472,9 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
469
472
} ,
470
473
15 => {
471
474
let final_value_msat = slice_to_be24 ( get_slice ! ( 3 ) ) as u64 ;
472
- let payee = Payee :: from_node_id ( get_pubkey ! ( ) ) ;
475
+ let payment_params = PaymentParameters :: from_node_id ( get_pubkey ! ( ) ) ;
473
476
let params = RouteParameters {
474
- payee ,
477
+ payment_params ,
475
478
final_value_msat,
476
479
final_cltv_expiry_delta : 42 ,
477
480
} ;
0 commit comments