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 #905 from TheBlueMatt/2021-04-mention-invoice-storage-docs
[rust-lightning]
/
lightning
/
src
/
ln
/
chanmon_update_fail_tests.rs
diff --git
a/lightning/src/ln/chanmon_update_fail_tests.rs
b/lightning/src/ln/chanmon_update_fail_tests.rs
index 619d02c8c0c452553deb156558eac250512fbd38..266f5b0aff7a0e11e11e301bb9e749940dd35418 100644
(file)
--- a/
lightning/src/ln/chanmon_update_fail_tests.rs
+++ b/
lightning/src/ln/chanmon_update_fail_tests.rs
@@
-206,9
+206,10
@@
fn do_test_simple_monitor_temporary_update_fail(disconnect: bool, persister_fail
let events_3 = nodes[1].node.get_and_clear_pending_events();
assert_eq!(events_3.len(), 1);
match events_3[0] {
let events_3 = nodes[1].node.get_and_clear_pending_events();
assert_eq!(events_3.len(), 1);
match events_3[0] {
- Event::PaymentReceived { ref payment_hash, ref payment_secret, amt, user_payment_id: _ } => {
+ Event::PaymentReceived { ref payment_hash, ref payment_
preimage, ref payment_
secret, amt, user_payment_id: _ } => {
assert_eq!(payment_hash_1, *payment_hash);
assert_eq!(payment_hash_1, *payment_hash);
- assert_eq!(Some(payment_secret_1), *payment_secret);
+ assert!(payment_preimage.is_none());
+ assert_eq!(payment_secret_1, *payment_secret);
assert_eq!(amt, 1000000);
},
_ => panic!("Unexpected event"),
assert_eq!(amt, 1000000);
},
_ => panic!("Unexpected event"),
@@
-574,9
+575,10
@@
fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
let events_5 = nodes[1].node.get_and_clear_pending_events();
assert_eq!(events_5.len(), 1);
match events_5[0] {
let events_5 = nodes[1].node.get_and_clear_pending_events();
assert_eq!(events_5.len(), 1);
match events_5[0] {
- Event::PaymentReceived { ref payment_hash, ref payment_secret, amt, user_payment_id: _ } => {
+ Event::PaymentReceived { ref payment_hash, ref payment_
preimage, ref payment_
secret, amt, user_payment_id: _ } => {
assert_eq!(payment_hash_2, *payment_hash);
assert_eq!(payment_hash_2, *payment_hash);
- assert_eq!(Some(payment_secret_2), *payment_secret);
+ assert!(payment_preimage.is_none());
+ assert_eq!(payment_secret_2, *payment_secret);
assert_eq!(amt, 1000000);
},
_ => panic!("Unexpected event"),
assert_eq!(amt, 1000000);
},
_ => panic!("Unexpected event"),
@@
-688,9
+690,10
@@
fn test_monitor_update_fail_cs() {
let events = nodes[1].node.get_and_clear_pending_events();
assert_eq!(events.len(), 1);
match events[0] {
let events = nodes[1].node.get_and_clear_pending_events();
assert_eq!(events.len(), 1);
match events[0] {
- Event::PaymentReceived { payment_hash, payment_secret, amt, user_payment_id: _ } => {
+ Event::PaymentReceived { payment_hash, payment_
preimage, payment_
secret, amt, user_payment_id: _ } => {
assert_eq!(payment_hash, our_payment_hash);
assert_eq!(payment_hash, our_payment_hash);
- assert_eq!(Some(our_payment_secret), payment_secret);
+ assert!(payment_preimage.is_none());
+ assert_eq!(our_payment_secret, payment_secret);
assert_eq!(amt, 1000000);
},
_ => panic!("Unexpected event"),
assert_eq!(amt, 1000000);
},
_ => panic!("Unexpected event"),