projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1972 from jkczyz/2023-01-bolt12-spec-updates
[rust-lightning]
/
lightning
/
src
/
ln
/
functional_test_utils.rs
diff --git
a/lightning/src/ln/functional_test_utils.rs
b/lightning/src/ln/functional_test_utils.rs
index 566c568b653e2914ae5845a44b843cc1b69163ba..868b38e3fdaf30d44b766286ca280208a4d36d9d 100644
(file)
--- a/
lightning/src/ln/functional_test_utils.rs
+++ b/
lightning/src/ln/functional_test_utils.rs
@@
-1447,6
+1447,11
@@
macro_rules! get_payment_preimage_hash {
}
};
($dest_node: expr, $min_value_msat: expr) => {
}
};
($dest_node: expr, $min_value_msat: expr) => {
+ {
+ crate::get_payment_preimage_hash!($dest_node, $min_value_msat, None)
+ }
+ };
+ ($dest_node: expr, $min_value_msat: expr, $min_final_cltv_expiry_delta: expr) => {
{
use bitcoin::hashes::Hash as _;
let mut payment_count = $dest_node.network_payment_count.borrow_mut();
{
use bitcoin::hashes::Hash as _;
let mut payment_count = $dest_node.network_payment_count.borrow_mut();
@@
-1454,10
+1459,10
@@
macro_rules! get_payment_preimage_hash {
*payment_count += 1;
let payment_hash = $crate::ln::PaymentHash(
bitcoin::hashes::sha256::Hash::hash(&payment_preimage.0[..]).into_inner());
*payment_count += 1;
let payment_hash = $crate::ln::PaymentHash(
bitcoin::hashes::sha256::Hash::hash(&payment_preimage.0[..]).into_inner());
- let payment_secret = $dest_node.node.create_inbound_payment_for_hash(payment_hash, $min_value_msat, 7200).unwrap();
+ let payment_secret = $dest_node.node.create_inbound_payment_for_hash(payment_hash, $min_value_msat, 7200
, $min_final_cltv_expiry_delta
).unwrap();
(payment_preimage, payment_hash, payment_secret)
}
(payment_preimage, payment_hash, payment_secret)
}
- }
+ }
;
}
#[macro_export]
}
#[macro_export]