mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-01-19 05:43:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1477 from dunxen/2022-05-invoice-expiry-nits

Browse Source
This commit is contained in:
Matt Corallo 2022-05-11 16:12:15 +00:00 committed by GitHub
commit 3cae233491
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lightning-invoice/src/utils.rs
View File

@ -230,8 +230,8 @@ where
let duration = SystemTime::now().duration_since(SystemTime::UNIX_EPOCH) let duration = SystemTime::now().duration_since(SystemTime::UNIX_EPOCH)
.expect("for the foreseeable future this shouldn't happen"); .expect("for the foreseeable future this shouldn't happen");
create_invoice_from_channelmanager_and_duration_since_epoch( create_invoice_from_channelmanager_and_duration_since_epoch(
channelmanager, keys_manager, network, amt_msat, channelmanager, keys_manager, network, amt_msat, description, duration,
description, duration, invoice_expiry_delta_secs invoice_expiry_delta_secs
) )
} }
@ -815,12 +815,11 @@ mod test {
}; };
let non_default_invoice_expiry_secs = 4200; let non_default_invoice_expiry_secs = 4200;
let invoice = ::utils::create_phantom_invoice::< let invoice =
EnforcingSigner, &test_utils::TestKeysInterface ::utils::create_phantom_invoice::<EnforcingSigner, &test_utils::TestKeysInterface>(
>( Some(payment_amt), payment_hash, "test".to_string(), non_default_invoice_expiry_secs,
Some(payment_amt), payment_hash, "test".to_string(), non_default_invoice_expiry_secs, route_hints, &nodes[1].keys_manager, Currency::BitcoinTestnet
route_hints, &nodes[1].keys_manager, Currency::BitcoinTestnet ).unwrap();
).unwrap();
let (payment_hash, payment_secret) = (PaymentHash(invoice.payment_hash().into_inner()), *invoice.payment_secret()); let (payment_hash, payment_secret) = (PaymentHash(invoice.payment_hash().into_inner()), *invoice.payment_secret());
let payment_preimage = if user_generated_pmt_hash { let payment_preimage = if user_generated_pmt_hash {
user_payment_preimage user_payment_preimage