@@ -52,7 +52,7 @@ fn test_monitor_and_persister_update_fail() {
52
52
let chan = create_announced_chan_between_nodes ( & nodes, 0 , 1 ) ;
53
53
54
54
// Rebalance the network to generate htlc in the two directions
55
- send_payment ( & nodes[ 0 ] , & vec ! [ & nodes[ 1 ] ] [ .. ] , 10_000_000 ) ;
55
+ send_payment ( & nodes[ 0 ] , & [ & nodes[ 1 ] ] , 10_000_000 ) ;
56
56
57
57
// Route an HTLC from node 0 to node 1 (but don't settle)
58
58
let ( preimage, payment_hash, ..) = route_payment ( & nodes[ 0 ] , & [ & nodes[ 1 ] ] , 9_000_000 ) ;
@@ -237,7 +237,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
237
237
assert_eq ! ( payment_hash_1, * payment_hash) ;
238
238
assert_eq ! ( amount_msat, 1_000_000 ) ;
239
239
assert_eq ! ( receiver_node_id. unwrap( ) , nodes[ 1 ] . node. get_our_node_id( ) ) ;
240
- assert_eq ! ( * via_channel_ids, vec! [ ( channel_id, Some ( user_channel_id) ) ] ) ;
240
+ assert_eq ! ( * via_channel_ids, & [ ( channel_id, Some ( user_channel_id) ) ] ) ;
241
241
match & purpose {
242
242
PaymentPurpose :: Bolt11InvoicePayment {
243
243
payment_preimage, payment_secret, ..
@@ -547,7 +547,7 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
547
547
assert ! ( bs_resp. 2 . as_ref( ) . unwrap( ) . update_fail_htlcs. is_empty( ) ) ;
548
548
assert ! ( bs_resp. 2 . as_ref( ) . unwrap( ) . update_fail_malformed_htlcs. is_empty( ) ) ;
549
549
assert ! ( bs_resp. 2 . as_ref( ) . unwrap( ) . update_fee. is_none( ) ) ;
550
- assert ! ( bs_resp. 2 . as_ref( ) . unwrap( ) . update_fulfill_htlcs == vec! [ bs_initial_fulfill] ) ;
550
+ assert_eq ! ( bs_resp. 2 . as_ref( ) . unwrap( ) . update_fulfill_htlcs, [ bs_initial_fulfill] ) ;
551
551
assert ! ( bs_resp. 2 . as_ref( ) . unwrap( ) . commitment_signed == bs_initial_commitment_signed) ;
552
552
553
553
assert ! ( as_resp. 1 . is_none( ) ) ;
@@ -779,7 +779,7 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
779
779
assert_eq ! ( payment_hash_2, * payment_hash) ;
780
780
assert_eq ! ( amount_msat, 1_000_000 ) ;
781
781
assert_eq ! ( receiver_node_id. unwrap( ) , nodes[ 1 ] . node. get_our_node_id( ) ) ;
782
- assert_eq ! ( * via_channel_ids, vec! [ ( channel_id, Some ( user_channel_id) ) ] ) ;
782
+ assert_eq ! ( via_channel_ids, [ ( channel_id, Some ( user_channel_id) ) ] ) ;
783
783
match & purpose {
784
784
PaymentPurpose :: Bolt11InvoicePayment {
785
785
payment_preimage, payment_secret, ..
@@ -940,7 +940,7 @@ fn test_monitor_update_fail_cs() {
940
940
assert_eq ! ( payment_hash, our_payment_hash) ;
941
941
assert_eq ! ( amount_msat, 1_000_000 ) ;
942
942
assert_eq ! ( receiver_node_id. unwrap( ) , nodes[ 1 ] . node. get_our_node_id( ) ) ;
943
- assert_eq ! ( * via_channel_ids, vec! [ ( channel_id, Some ( user_channel_id) ) ] ) ;
943
+ assert_eq ! ( via_channel_ids, [ ( channel_id, Some ( user_channel_id) ) ] ) ;
944
944
match & purpose {
945
945
PaymentPurpose :: Bolt11InvoicePayment {
946
946
payment_preimage, payment_secret, ..
@@ -1171,7 +1171,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
1171
1171
nodes[ 2 ] . node . fail_htlc_backwards ( & payment_hash_1) ;
1172
1172
expect_pending_htlcs_forwardable_and_htlc_handling_failed ! (
1173
1173
nodes[ 2 ] ,
1174
- vec! [ HTLCHandlingFailureType :: Receive { payment_hash: payment_hash_1 } ]
1174
+ [ HTLCHandlingFailureType :: Receive { payment_hash: payment_hash_1 } ]
1175
1175
) ;
1176
1176
check_added_monitors ! ( nodes[ 2 ] , 1 ) ;
1177
1177
@@ -1303,7 +1303,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
1303
1303
check_added_monitors ! ( nodes[ 1 ] , 0 ) ;
1304
1304
expect_pending_htlcs_forwardable_and_htlc_handling_failed ! (
1305
1305
nodes[ 1 ] ,
1306
- vec! [ HTLCHandlingFailureType :: Forward {
1306
+ [ HTLCHandlingFailureType :: Forward {
1307
1307
node_id: Some ( nodes[ 2 ] . node. get_our_node_id( ) ) ,
1308
1308
channel_id: chan_2. 2
1309
1309
} ]
@@ -2509,7 +2509,7 @@ fn test_monitor_update_fail_claim() {
2509
2509
assert_eq ! ( payment_hash_3, * payment_hash) ;
2510
2510
assert_eq ! ( 1_000_000 , amount_msat) ;
2511
2511
assert_eq ! ( receiver_node_id. unwrap( ) , nodes[ 0 ] . node. get_our_node_id( ) ) ;
2512
- assert_eq ! ( * via_channel_ids, vec! [ ( channel_id, Some ( 42 ) ) ] ) ;
2512
+ assert_eq ! ( via_channel_ids, [ ( channel_id, Some ( 42 ) ) ] ) ;
2513
2513
match & purpose {
2514
2514
PaymentPurpose :: Bolt11InvoicePayment {
2515
2515
payment_preimage, payment_secret, ..
@@ -2544,7 +2544,7 @@ fn test_monitor_update_on_pending_forwards() {
2544
2544
nodes[ 2 ] . node . fail_htlc_backwards ( & payment_hash_1) ;
2545
2545
expect_pending_htlcs_forwardable_and_htlc_handling_failed ! (
2546
2546
nodes[ 2 ] ,
2547
- vec! [ HTLCHandlingFailureType :: Receive { payment_hash: payment_hash_1 } ]
2547
+ [ HTLCHandlingFailureType :: Receive { payment_hash: payment_hash_1 } ]
2548
2548
) ;
2549
2549
check_added_monitors ! ( nodes[ 2 ] , 1 ) ;
2550
2550
@@ -2580,7 +2580,7 @@ fn test_monitor_update_on_pending_forwards() {
2580
2580
chanmon_cfgs[ 1 ] . persister . set_update_ret ( ChannelMonitorUpdateStatus :: InProgress ) ;
2581
2581
expect_pending_htlcs_forwardable_and_htlc_handling_failed ! (
2582
2582
nodes[ 1 ] ,
2583
- vec! [ HTLCHandlingFailureType :: Forward {
2583
+ [ HTLCHandlingFailureType :: Forward {
2584
2584
node_id: Some ( nodes[ 2 ] . node. get_our_node_id( ) ) ,
2585
2585
channel_id: chan_2. 2
2586
2586
} ]
@@ -3252,7 +3252,7 @@ fn test_fail_htlc_on_broadcast_after_claim() {
3252
3252
check_added_monitors ! ( nodes[ 1 ] , 1 ) ;
3253
3253
expect_pending_htlcs_forwardable_and_htlc_handling_failed ! (
3254
3254
nodes[ 1 ] ,
3255
- vec! [ HTLCHandlingFailureType :: Forward {
3255
+ [ HTLCHandlingFailureType :: Forward {
3256
3256
node_id: Some ( nodes[ 2 ] . node. get_our_node_id( ) ) ,
3257
3257
channel_id: chan_id_2
3258
3258
} ]
@@ -3754,7 +3754,7 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
3754
3754
nodes[ 2 ] . node . fail_htlc_backwards ( & payment_hash) ;
3755
3755
expect_pending_htlcs_forwardable_and_htlc_handling_failed ! (
3756
3756
nodes[ 2 ] ,
3757
- vec! [ HTLCHandlingFailureType :: Receive { payment_hash } ]
3757
+ [ HTLCHandlingFailureType :: Receive { payment_hash } ]
3758
3758
) ;
3759
3759
check_added_monitors ! ( nodes[ 2 ] , 1 ) ;
3760
3760
get_htlc_update_msgs ! ( nodes[ 2 ] , nodes[ 1 ] . node. get_our_node_id( ) ) ;
@@ -3803,7 +3803,7 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
3803
3803
reconnect_nodes ( reconnect_args) ;
3804
3804
expect_pending_htlcs_forwardable_and_htlc_handling_failed ! (
3805
3805
nodes[ 1 ] ,
3806
- vec! [ HTLCHandlingFailureType :: Forward {
3806
+ [ HTLCHandlingFailureType :: Forward {
3807
3807
node_id: Some ( nodes[ 2 ] . node. get_our_node_id( ) ) ,
3808
3808
channel_id: chan_id_2
3809
3809
} ]
0 commit comments