@@ -1046,35 +1046,35 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
1046
1046
_ => panic ! ( "Unexpected event" ) ,
1047
1047
}
1048
1048
}
1049
- assert_eq ! ( as_cs. update_add_htlcs. len( ) , 1 ) ;
1050
- assert ! ( as_cs. update_fail_htlcs. is_empty( ) ) ;
1051
- assert ! ( as_cs. update_fail_malformed_htlcs. is_empty( ) ) ;
1052
- assert ! ( as_cs. update_fulfill_htlcs. is_empty( ) ) ;
1053
- assert ! ( as_cs. update_fee. is_none( ) ) ;
1054
- let as_raa = get_event_msg ! ( nodes[ 1 ] , MessageSendEvent :: SendRevokeAndACK , nodes[ 2 ] . node. get_our_node_id( ) ) ;
1055
1049
1050
+ assert_eq ! ( as_cs. update_add_htlcs. len( ) , 1 ) ;
1051
+ assert ! ( as_cs. update_fail_htlcs. is_empty( ) ) ;
1052
+ assert ! ( as_cs. update_fail_malformed_htlcs. is_empty( ) ) ;
1053
+ assert ! ( as_cs. update_fulfill_htlcs. is_empty( ) ) ;
1054
+ assert ! ( as_cs. update_fee. is_none( ) ) ;
1055
+ let as_raa = get_event_msg ! ( nodes[ 1 ] , MessageSendEvent :: SendRevokeAndACK , nodes[ 2 ] . node. get_our_node_id( ) ) ;
1056
1056
1057
- nodes[ 2 ] . node . handle_update_add_htlc ( & nodes[ 1 ] . node . get_our_node_id ( ) , & as_cs. update_add_htlcs [ 0 ] ) ;
1058
- nodes[ 2 ] . node . handle_commitment_signed ( & nodes[ 1 ] . node . get_our_node_id ( ) , & as_cs. commitment_signed ) ;
1059
- check_added_monitors ! ( nodes[ 2 ] , 1 ) ;
1060
- let bs_second_raa = get_event_msg ! ( nodes[ 2 ] , MessageSendEvent :: SendRevokeAndACK , nodes[ 1 ] . node. get_our_node_id( ) ) ;
1061
1057
1062
- nodes[ 2 ] . node . handle_revoke_and_ack ( & nodes[ 1 ] . node . get_our_node_id ( ) , & as_raa) ;
1063
- check_added_monitors ! ( nodes[ 2 ] , 1 ) ;
1064
- let bs_second_cs = get_htlc_update_msgs ! ( nodes[ 2 ] , nodes[ 1 ] . node. get_our_node_id( ) ) ;
1058
+ nodes[ 2 ] . node . handle_update_add_htlc ( & nodes[ 1 ] . node . get_our_node_id ( ) , & as_cs. update_add_htlcs [ 0 ] ) ;
1059
+ nodes[ 2 ] . node . handle_commitment_signed ( & nodes[ 1 ] . node . get_our_node_id ( ) , & as_cs. commitment_signed ) ;
1060
+ check_added_monitors ! ( nodes[ 2 ] , 1 ) ;
1061
+ let bs_second_raa = get_event_msg ! ( nodes[ 2 ] , MessageSendEvent :: SendRevokeAndACK , nodes[ 1 ] . node. get_our_node_id( ) ) ;
1065
1062
1066
- nodes[ 1 ] . node . handle_revoke_and_ack ( & nodes[ 2 ] . node . get_our_node_id ( ) , & bs_second_raa ) ;
1067
- check_added_monitors ! ( nodes[ 1 ] , 1 ) ;
1068
- assert ! ( nodes[ 1 ] . node. get_and_clear_pending_msg_events ( ) . is_empty ( ) ) ;
1063
+ nodes[ 2 ] . node . handle_revoke_and_ack ( & nodes[ 1 ] . node . get_our_node_id ( ) , & as_raa ) ;
1064
+ check_added_monitors ! ( nodes[ 2 ] , 1 ) ;
1065
+ let bs_second_cs = get_htlc_update_msgs ! ( nodes[ 2 ] , nodes [ 1 ] . node. get_our_node_id ( ) ) ;
1069
1066
1070
- nodes[ 1 ] . node . handle_commitment_signed ( & nodes[ 2 ] . node . get_our_node_id ( ) , & bs_second_cs . commitment_signed ) ;
1071
- check_added_monitors ! ( nodes[ 1 ] , 1 ) ;
1072
- let as_second_raa = get_event_msg ! ( nodes[ 1 ] , MessageSendEvent :: SendRevokeAndACK , nodes [ 2 ] . node. get_our_node_id ( ) ) ;
1067
+ nodes[ 1 ] . node . handle_revoke_and_ack ( & nodes[ 2 ] . node . get_our_node_id ( ) , & bs_second_raa ) ;
1068
+ check_added_monitors ! ( nodes[ 1 ] , 1 ) ;
1069
+ assert ! ( nodes[ 1 ] . node. get_and_clear_pending_msg_events ( ) . is_empty ( ) ) ;
1073
1070
1074
- nodes[ 2 ] . node . handle_revoke_and_ack ( & nodes[ 1 ] . node . get_our_node_id ( ) , & as_second_raa ) ;
1075
- check_added_monitors ! ( nodes[ 2 ] , 1 ) ;
1076
- assert ! ( nodes[ 2 ] . node. get_and_clear_pending_msg_events ( ) . is_empty ( ) ) ;
1071
+ nodes[ 1 ] . node . handle_commitment_signed ( & nodes[ 2 ] . node . get_our_node_id ( ) , & bs_second_cs . commitment_signed ) ;
1072
+ check_added_monitors ! ( nodes[ 1 ] , 1 ) ;
1073
+ let as_second_raa = get_event_msg ! ( nodes[ 1 ] , MessageSendEvent :: SendRevokeAndACK , nodes [ 2 ] . node. get_our_node_id ( ) ) ;
1077
1074
1075
+ nodes[ 2 ] . node . handle_revoke_and_ack ( & nodes[ 1 ] . node . get_our_node_id ( ) , & as_second_raa) ;
1076
+ check_added_monitors ! ( nodes[ 2 ] , 1 ) ;
1077
+ assert ! ( nodes[ 2 ] . node. get_and_clear_pending_msg_events( ) . is_empty( ) ) ;
1078
1078
1079
1079
expect_pending_htlcs_forwardable ! ( nodes[ 2 ] ) ;
1080
1080
0 commit comments