@@ -30,7 +30,7 @@ fn test_simple_monitor_permanent_update_fail() {
30
30
let ( _, payment_hash_1) = get_payment_preimage_hash ! ( & nodes[ 0 ] ) ;
31
31
32
32
* nodes[ 0 ] . chan_monitor . update_ret . lock ( ) . unwrap ( ) = Err ( ChannelMonitorUpdateErr :: PermanentFailure ) ;
33
- unwrap_send_err ! ( nodes[ 0 ] . node. send_payment( route, payment_hash_1, & None ) , true , APIError :: ChannelUnavailable { ..} , { } ) ;
33
+ unwrap_send_err ! ( nodes[ 0 ] . node. send_payment( & route, payment_hash_1, & None ) , true , APIError :: ChannelUnavailable { ..} , { } ) ;
34
34
check_added_monitors ! ( nodes[ 0 ] , 2 ) ;
35
35
36
36
let events_1 = nodes[ 0 ] . node . get_and_clear_pending_msg_events ( ) ;
@@ -64,7 +64,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
64
64
65
65
* nodes[ 0 ] . chan_monitor . update_ret . lock ( ) . unwrap ( ) = Err ( ChannelMonitorUpdateErr :: TemporaryFailure ) ;
66
66
67
- unwrap_send_err ! ( nodes[ 0 ] . node. send_payment( route. clone ( ) , payment_hash_1, & None ) , false , APIError :: MonitorUpdateFailed , { } ) ;
67
+ unwrap_send_err ! ( nodes[ 0 ] . node. send_payment( & route, payment_hash_1, & None ) , false , APIError :: MonitorUpdateFailed , { } ) ;
68
68
check_added_monitors ! ( nodes[ 0 ] , 1 ) ;
69
69
70
70
assert ! ( nodes[ 0 ] . node. get_and_clear_pending_events( ) . is_empty( ) ) ;
@@ -107,7 +107,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
107
107
// Now set it to failed again...
108
108
let ( _, payment_hash_2) = get_payment_preimage_hash ! ( & nodes[ 0 ] ) ;
109
109
* nodes[ 0 ] . chan_monitor . update_ret . lock ( ) . unwrap ( ) = Err ( ChannelMonitorUpdateErr :: TemporaryFailure ) ;
110
- unwrap_send_err ! ( nodes[ 0 ] . node. send_payment( route, payment_hash_2, & None ) , false , APIError :: MonitorUpdateFailed , { } ) ;
110
+ unwrap_send_err ! ( nodes[ 0 ] . node. send_payment( & route, payment_hash_2, & None ) , false , APIError :: MonitorUpdateFailed , { } ) ;
111
111
check_added_monitors ! ( nodes[ 0 ] , 1 ) ;
112
112
113
113
assert ! ( nodes[ 0 ] . node. get_and_clear_pending_events( ) . is_empty( ) ) ;
@@ -170,7 +170,7 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
170
170
let ( payment_preimage_2, payment_hash_2) = get_payment_preimage_hash ! ( nodes[ 0 ] ) ;
171
171
172
172
* nodes[ 0 ] . chan_monitor . update_ret . lock ( ) . unwrap ( ) = Err ( ChannelMonitorUpdateErr :: TemporaryFailure ) ;
173
- unwrap_send_err ! ( nodes[ 0 ] . node. send_payment( route. clone ( ) , payment_hash_2, & None ) , false , APIError :: MonitorUpdateFailed , { } ) ;
173
+ unwrap_send_err ! ( nodes[ 0 ] . node. send_payment( & route, payment_hash_2, & None ) , false , APIError :: MonitorUpdateFailed , { } ) ;
174
174
check_added_monitors ! ( nodes[ 0 ] , 1 ) ;
175
175
176
176
assert ! ( nodes[ 0 ] . node. get_and_clear_pending_events( ) . is_empty( ) ) ;
@@ -497,7 +497,7 @@ fn test_monitor_update_fail_cs() {
497
497
498
498
let route = nodes[ 0 ] . router . get_route ( & nodes[ 1 ] . node . get_our_node_id ( ) , None , & Vec :: new ( ) , 1000000 , TEST_FINAL_CLTV ) . unwrap ( ) ;
499
499
let ( payment_preimage, our_payment_hash) = get_payment_preimage_hash ! ( nodes[ 0 ] ) ;
500
- nodes[ 0 ] . node . send_payment ( route, our_payment_hash, & None ) . unwrap ( ) ;
500
+ nodes[ 0 ] . node . send_payment ( & route, our_payment_hash, & None ) . unwrap ( ) ;
501
501
check_added_monitors ! ( nodes[ 0 ] , 1 ) ;
502
502
503
503
let send_event = SendEvent :: from_event ( nodes[ 0 ] . node . get_and_clear_pending_msg_events ( ) . remove ( 0 ) ) ;
@@ -582,7 +582,7 @@ fn test_monitor_update_fail_no_rebroadcast() {
582
582
583
583
let route = nodes[ 0 ] . router . get_route ( & nodes[ 1 ] . node . get_our_node_id ( ) , None , & Vec :: new ( ) , 1000000 , TEST_FINAL_CLTV ) . unwrap ( ) ;
584
584
let ( payment_preimage_1, our_payment_hash) = get_payment_preimage_hash ! ( nodes[ 0 ] ) ;
585
- nodes[ 0 ] . node . send_payment ( route, our_payment_hash, & None ) . unwrap ( ) ;
585
+ nodes[ 0 ] . node . send_payment ( & route, our_payment_hash, & None ) . unwrap ( ) ;
586
586
check_added_monitors ! ( nodes[ 0 ] , 1 ) ;
587
587
588
588
let send_event = SendEvent :: from_event ( nodes[ 0 ] . node . get_and_clear_pending_msg_events ( ) . remove ( 0 ) ) ;
@@ -630,13 +630,13 @@ fn test_monitor_update_raa_while_paused() {
630
630
631
631
let route = nodes[ 0 ] . router . get_route ( & nodes[ 1 ] . node . get_our_node_id ( ) , None , & Vec :: new ( ) , 1000000 , TEST_FINAL_CLTV ) . unwrap ( ) ;
632
632
let ( payment_preimage_1, our_payment_hash_1) = get_payment_preimage_hash ! ( nodes[ 0 ] ) ;
633
- nodes[ 0 ] . node . send_payment ( route, our_payment_hash_1, & None ) . unwrap ( ) ;
633
+ nodes[ 0 ] . node . send_payment ( & route, our_payment_hash_1, & None ) . unwrap ( ) ;
634
634
check_added_monitors ! ( nodes[ 0 ] , 1 ) ;
635
635
let send_event_1 = SendEvent :: from_event ( nodes[ 0 ] . node . get_and_clear_pending_msg_events ( ) . remove ( 0 ) ) ;
636
636
637
637
let route = nodes[ 1 ] . router . get_route ( & nodes[ 0 ] . node . get_our_node_id ( ) , None , & Vec :: new ( ) , 1000000 , TEST_FINAL_CLTV ) . unwrap ( ) ;
638
638
let ( payment_preimage_2, our_payment_hash_2) = get_payment_preimage_hash ! ( nodes[ 0 ] ) ;
639
- nodes[ 1 ] . node . send_payment ( route, our_payment_hash_2, & None ) . unwrap ( ) ;
639
+ nodes[ 1 ] . node . send_payment ( & route, our_payment_hash_2, & None ) . unwrap ( ) ;
640
640
check_added_monitors ! ( nodes[ 1 ] , 1 ) ;
641
641
let send_event_2 = SendEvent :: from_event ( nodes[ 1 ] . node . get_and_clear_pending_msg_events ( ) . remove ( 0 ) ) ;
642
642
@@ -724,7 +724,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
724
724
// holding cell.
725
725
let ( payment_preimage_2, payment_hash_2) = get_payment_preimage_hash ! ( nodes[ 0 ] ) ;
726
726
let route = nodes[ 0 ] . router . get_route ( & nodes[ 2 ] . node . get_our_node_id ( ) , None , & Vec :: new ( ) , 1000000 , TEST_FINAL_CLTV ) . unwrap ( ) ;
727
- nodes[ 0 ] . node . send_payment ( route, payment_hash_2, & None ) . unwrap ( ) ;
727
+ nodes[ 0 ] . node . send_payment ( & route, payment_hash_2, & None ) . unwrap ( ) ;
728
728
check_added_monitors ! ( nodes[ 0 ] , 1 ) ;
729
729
730
730
let mut send_event = SendEvent :: from_event ( nodes[ 0 ] . node . get_and_clear_pending_msg_events ( ) . remove ( 0 ) ) ;
@@ -749,7 +749,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
749
749
750
750
let ( _, payment_hash_3) = get_payment_preimage_hash ! ( nodes[ 0 ] ) ;
751
751
let route = nodes[ 0 ] . router . get_route ( & nodes[ 2 ] . node . get_our_node_id ( ) , None , & Vec :: new ( ) , 1000000 , TEST_FINAL_CLTV ) . unwrap ( ) ;
752
- nodes[ 0 ] . node . send_payment ( route, payment_hash_3, & None ) . unwrap ( ) ;
752
+ nodes[ 0 ] . node . send_payment ( & route, payment_hash_3, & None ) . unwrap ( ) ;
753
753
check_added_monitors ! ( nodes[ 0 ] , 1 ) ;
754
754
755
755
* nodes[ 1 ] . chan_monitor . update_ret . lock ( ) . unwrap ( ) = Ok ( ( ) ) ; // We succeed in updating the monitor for the first channel
@@ -796,7 +796,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
796
796
// Try to route another payment backwards from 2 to make sure 1 holds off on responding
797
797
let ( payment_preimage_4, payment_hash_4) = get_payment_preimage_hash ! ( nodes[ 0 ] ) ;
798
798
let route = nodes[ 2 ] . router . get_route ( & nodes[ 0 ] . node . get_our_node_id ( ) , None , & Vec :: new ( ) , 1000000 , TEST_FINAL_CLTV ) . unwrap ( ) ;
799
- nodes[ 2 ] . node . send_payment ( route, payment_hash_4, & None ) . unwrap ( ) ;
799
+ nodes[ 2 ] . node . send_payment ( & route, payment_hash_4, & None ) . unwrap ( ) ;
800
800
check_added_monitors ! ( nodes[ 2 ] , 1 ) ;
801
801
802
802
send_event = SendEvent :: from_event ( nodes[ 2 ] . node . get_and_clear_pending_msg_events ( ) . remove ( 0 ) ) ;
@@ -1047,9 +1047,9 @@ fn raa_no_response_awaiting_raa_state() {
1047
1047
// immediately after a CS. By setting failing the monitor update failure from the CS (which
1048
1048
// requires only an RAA response due to AwaitingRAA) we can deliver the RAA and require the CS
1049
1049
// generation during RAA while in monitor-update-failed state.
1050
- nodes[ 0 ] . node . send_payment ( route. clone ( ) , payment_hash_1, & None ) . unwrap ( ) ;
1050
+ nodes[ 0 ] . node . send_payment ( & route, payment_hash_1, & None ) . unwrap ( ) ;
1051
1051
check_added_monitors ! ( nodes[ 0 ] , 1 ) ;
1052
- nodes[ 0 ] . node . send_payment ( route. clone ( ) , payment_hash_2, & None ) . unwrap ( ) ;
1052
+ nodes[ 0 ] . node . send_payment ( & route, payment_hash_2, & None ) . unwrap ( ) ;
1053
1053
check_added_monitors ! ( nodes[ 0 ] , 0 ) ;
1054
1054
1055
1055
let mut events = nodes[ 0 ] . node . get_and_clear_pending_msg_events ( ) ;
@@ -1097,7 +1097,7 @@ fn raa_no_response_awaiting_raa_state() {
1097
1097
// We send a third payment here, which is somewhat of a redundant test, but the
1098
1098
// chanmon_fail_consistency test required it to actually find the bug (by seeing out-of-sync
1099
1099
// commitment transaction states) whereas here we can explicitly check for it.
1100
- nodes[ 0 ] . node . send_payment ( route. clone ( ) , payment_hash_3, & None ) . unwrap ( ) ;
1100
+ nodes[ 0 ] . node . send_payment ( & route, payment_hash_3, & None ) . unwrap ( ) ;
1101
1101
check_added_monitors ! ( nodes[ 0 ] , 0 ) ;
1102
1102
assert ! ( nodes[ 0 ] . node. get_and_clear_pending_msg_events( ) . is_empty( ) ) ;
1103
1103
@@ -1186,7 +1186,7 @@ fn claim_while_disconnected_monitor_update_fail() {
1186
1186
// the monitor still failed
1187
1187
let route = nodes[ 0 ] . router . get_route ( & nodes[ 1 ] . node . get_our_node_id ( ) , None , & Vec :: new ( ) , 1000000 , TEST_FINAL_CLTV ) . unwrap ( ) ;
1188
1188
let ( payment_preimage_2, payment_hash_2) = get_payment_preimage_hash ! ( nodes[ 0 ] ) ;
1189
- nodes[ 0 ] . node . send_payment ( route, payment_hash_2, & None ) . unwrap ( ) ;
1189
+ nodes[ 0 ] . node . send_payment ( & route, payment_hash_2, & None ) . unwrap ( ) ;
1190
1190
check_added_monitors ! ( nodes[ 0 ] , 1 ) ;
1191
1191
1192
1192
let as_updates = get_htlc_update_msgs ! ( nodes[ 0 ] , nodes[ 1 ] . node. get_our_node_id( ) ) ;
@@ -1278,7 +1278,7 @@ fn monitor_failed_no_reestablish_response() {
1278
1278
// on receipt).
1279
1279
let route = nodes[ 0 ] . router . get_route ( & nodes[ 1 ] . node . get_our_node_id ( ) , None , & Vec :: new ( ) , 1000000 , TEST_FINAL_CLTV ) . unwrap ( ) ;
1280
1280
let ( payment_preimage_1, payment_hash_1) = get_payment_preimage_hash ! ( nodes[ 0 ] ) ;
1281
- nodes[ 0 ] . node . send_payment ( route, payment_hash_1, & None ) . unwrap ( ) ;
1281
+ nodes[ 0 ] . node . send_payment ( & route, payment_hash_1, & None ) . unwrap ( ) ;
1282
1282
check_added_monitors ! ( nodes[ 0 ] , 1 ) ;
1283
1283
1284
1284
* nodes[ 1 ] . chan_monitor . update_ret . lock ( ) . unwrap ( ) = Err ( ChannelMonitorUpdateErr :: TemporaryFailure ) ;
@@ -1348,7 +1348,7 @@ fn first_message_on_recv_ordering() {
1348
1348
// can deliver it and fail the monitor update.
1349
1349
let route = nodes[ 0 ] . router . get_route ( & nodes[ 1 ] . node . get_our_node_id ( ) , None , & Vec :: new ( ) , 1000000 , TEST_FINAL_CLTV ) . unwrap ( ) ;
1350
1350
let ( payment_preimage_1, payment_hash_1) = get_payment_preimage_hash ! ( nodes[ 0 ] ) ;
1351
- nodes[ 0 ] . node . send_payment ( route, payment_hash_1, & None ) . unwrap ( ) ;
1351
+ nodes[ 0 ] . node . send_payment ( & route, payment_hash_1, & None ) . unwrap ( ) ;
1352
1352
check_added_monitors ! ( nodes[ 0 ] , 1 ) ;
1353
1353
1354
1354
let mut events = nodes[ 0 ] . node . get_and_clear_pending_msg_events ( ) ;
@@ -1370,7 +1370,7 @@ fn first_message_on_recv_ordering() {
1370
1370
// Route the second payment, generating an update_add_htlc/commitment_signed
1371
1371
let route = nodes[ 0 ] . router . get_route ( & nodes[ 1 ] . node . get_our_node_id ( ) , None , & Vec :: new ( ) , 1000000 , TEST_FINAL_CLTV ) . unwrap ( ) ;
1372
1372
let ( payment_preimage_2, payment_hash_2) = get_payment_preimage_hash ! ( nodes[ 0 ] ) ;
1373
- nodes[ 0 ] . node . send_payment ( route, payment_hash_2, & None ) . unwrap ( ) ;
1373
+ nodes[ 0 ] . node . send_payment ( & route, payment_hash_2, & None ) . unwrap ( ) ;
1374
1374
check_added_monitors ! ( nodes[ 0 ] , 1 ) ;
1375
1375
let mut events = nodes[ 0 ] . node . get_and_clear_pending_msg_events ( ) ;
1376
1376
assert_eq ! ( events. len( ) , 1 ) ;
@@ -1446,7 +1446,7 @@ fn test_monitor_update_fail_claim() {
1446
1446
1447
1447
let route = nodes[ 2 ] . router . get_route ( & nodes[ 0 ] . node . get_our_node_id ( ) , None , & Vec :: new ( ) , 1000000 , TEST_FINAL_CLTV ) . unwrap ( ) ;
1448
1448
let ( _, payment_hash_2) = get_payment_preimage_hash ! ( nodes[ 0 ] ) ;
1449
- nodes[ 2 ] . node . send_payment ( route, payment_hash_2, & None ) . unwrap ( ) ;
1449
+ nodes[ 2 ] . node . send_payment ( & route, payment_hash_2, & None ) . unwrap ( ) ;
1450
1450
check_added_monitors ! ( nodes[ 2 ] , 1 ) ;
1451
1451
1452
1452
// Successfully update the monitor on the 1<->2 channel, but the 0<->1 channel should still be
@@ -1527,7 +1527,7 @@ fn test_monitor_update_on_pending_forwards() {
1527
1527
1528
1528
let route = nodes[ 2 ] . router . get_route ( & nodes[ 0 ] . node . get_our_node_id ( ) , None , & Vec :: new ( ) , 1000000 , TEST_FINAL_CLTV ) . unwrap ( ) ;
1529
1529
let ( payment_preimage_2, payment_hash_2) = get_payment_preimage_hash ! ( nodes[ 0 ] ) ;
1530
- nodes[ 2 ] . node . send_payment ( route, payment_hash_2, & None ) . unwrap ( ) ;
1530
+ nodes[ 2 ] . node . send_payment ( & route, payment_hash_2, & None ) . unwrap ( ) ;
1531
1531
check_added_monitors ! ( nodes[ 2 ] , 1 ) ;
1532
1532
1533
1533
let mut events = nodes[ 2 ] . node . get_and_clear_pending_msg_events ( ) ;
@@ -1586,7 +1586,7 @@ fn monitor_update_claim_fail_no_response() {
1586
1586
// Now start forwarding a second payment, skipping the last RAA so B is in AwaitingRAA
1587
1587
let route = nodes[ 0 ] . router . get_route ( & nodes[ 1 ] . node . get_our_node_id ( ) , None , & Vec :: new ( ) , 1000000 , TEST_FINAL_CLTV ) . unwrap ( ) ;
1588
1588
let ( payment_preimage_2, payment_hash_2) = get_payment_preimage_hash ! ( nodes[ 0 ] ) ;
1589
- nodes[ 0 ] . node . send_payment ( route, payment_hash_2, & None ) . unwrap ( ) ;
1589
+ nodes[ 0 ] . node . send_payment ( & route, payment_hash_2, & None ) . unwrap ( ) ;
1590
1590
check_added_monitors ! ( nodes[ 0 ] , 1 ) ;
1591
1591
1592
1592
let mut events = nodes[ 0 ] . node . get_and_clear_pending_msg_events ( ) ;
0 commit comments