Add/update test for update_fee

Author: yuntai

src/ln/channelmanager.rs

@@ -3048,7 +3048,7 @@ mod tests {
 	}
 
 	#[test]
-	fn test_update_fee() {
+	fn test_update_fee_vanilla() {
 		let nodes = create_network(2);
 		let chan = create_announced_chan_between_nodes(&nodes, 0, 1);
 		let channel_id = chan.2;
@@ -3061,6 +3061,14 @@ mod tests {
 			}}
 		}
 
+		macro_rules! check_added_monitors_and_clear {
+			($node: expr) => {{
+				let mut added_monitors = $node.chan_monitor.added_monitors.lock().unwrap();
+				assert_eq!(added_monitors.len(), 1);
+				added_monitors.clear();
+			}}
+		}
+
 		let feerate = get_feerate!(nodes[0]);
 		nodes[0].node.update_fee(channel_id, feerate+20).unwrap();
 
@@ -3075,42 +3083,103 @@ mod tests {
 		nodes[1].node.handle_update_fee(&nodes[0].node.get_our_node_id(), update_msg.unwrap()).unwrap();
 
 		let (revoke_msg, commitment_signed) = nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), commitment_signed).unwrap();
-		{
-			let mut added_monitors = nodes[0].chan_monitor.added_monitors.lock().unwrap();
-			assert_eq!(added_monitors.len(), 1);
-			added_monitors.clear();
-		}
-		{
-			let mut added_monitors = nodes[1].chan_monitor.added_monitors.lock().unwrap();
-			assert_eq!(added_monitors.len(), 1);
-			added_monitors.clear();
-		}
 		let commitment_signed = commitment_signed.unwrap();
+		check_added_monitors_and_clear!(nodes[0]);
+		check_added_monitors_and_clear!(nodes[1]);
+
 		let resp_option = nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &revoke_msg).unwrap();
-		{
-			let mut added_monitors = nodes[0].chan_monitor.added_monitors.lock().unwrap();
-			assert_eq!(added_monitors.len(), 1);
-			added_monitors.clear();
-		}
 		assert!(resp_option.is_none());
+		check_added_monitors_and_clear!(nodes[0]);
 
 		let (revoke_msg, commitment_signed) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &commitment_signed).unwrap();
 		assert!(commitment_signed.is_none());
-		{
-			let mut added_monitors = nodes[0].chan_monitor.added_monitors.lock().unwrap();
-			assert_eq!(added_monitors.len(), 1);
-			added_monitors.clear();
-		}
+		check_added_monitors_and_clear!(nodes[0]);
+
 		let resp_option = nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &revoke_msg).unwrap();
-		{
-			let mut added_monitors = nodes[1].chan_monitor.added_monitors.lock().unwrap();
-			assert_eq!(added_monitors.len(), 1);
-			added_monitors.clear();
+		assert!(resp_option.is_none());
+		check_added_monitors_and_clear!(nodes[1]);
+	}
+
+	#[test]
+	fn test_update_fee() {
+		let nodes = create_network(2);
+		let chan = create_announced_chan_between_nodes(&nodes, 0, 1);
+		let channel_id = chan.2;
+
+		macro_rules! get_feerate {
+			($node: expr) => {{
+				let chan_lock = $node.node.channel_state.lock().unwrap();
+				let chan = chan_lock.by_id.get(&channel_id).unwrap();
+				chan.get_feerate()
+			}}
 		}
+
+		macro_rules! check_added_monitors_and_clear {
+			($node: expr) => {{
+				let mut added_monitors = $node.chan_monitor.added_monitors.lock().unwrap();
+				assert_eq!(added_monitors.len(), 1);
+				added_monitors.clear();
+			}}
+		}
+
+		let feerate = get_feerate!(nodes[0]);
+		nodes[0].node.update_fee(channel_id, feerate+20).unwrap();
+
+		let events_0 = nodes[0].node.get_and_clear_pending_events();
+		assert_eq!(events_0.len(), 1);
+		let (update_msg, commitment_signed) = match events_0[0] {
+				Event::UpdateHTLCs { node_id:_, updates: msgs::CommitmentUpdate { update_add_htlcs:_, update_fulfill_htlcs:_, update_fail_htlcs:_, update_fail_malformed_htlcs:_, ref update_fee, ref commitment_signed } } => {
+				(update_fee.as_ref(), commitment_signed)
+			},
+			_ => panic!("Unexpected event"),
+		};
+		nodes[1].node.handle_update_fee(&nodes[0].node.get_our_node_id(), update_msg.unwrap()).unwrap();
+
+		let (revoke_msg, commitment_signed) = nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), commitment_signed).unwrap();
+		let commitment_signed_0 = commitment_signed.unwrap();
+		check_added_monitors_and_clear!(nodes[0]);
+		check_added_monitors_and_clear!(nodes[1]);
+
+		let resp_option = nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &revoke_msg).unwrap();
+		assert!(resp_option.is_none());
+		check_added_monitors_and_clear!(nodes[0]);
+
+		nodes[0].node.update_fee(channel_id, feerate+30).unwrap();
+		let events_0 = nodes[0].node.get_and_clear_pending_events();
+		assert_eq!(events_0.len(), 1);
+		let (update_msg, commitment_signed) = match events_0[0] {
+				Event::UpdateHTLCs { node_id:_, updates: msgs::CommitmentUpdate { update_add_htlcs:_, update_fulfill_htlcs:_, update_fail_htlcs:_, update_fail_malformed_htlcs:_, ref update_fee, ref commitment_signed } } => {
+				(update_fee.as_ref(), commitment_signed)
+			},
+			_ => panic!("Unexpected event"),
+		};
+		nodes[1].node.handle_update_fee(&nodes[0].node.get_our_node_id(), update_msg.unwrap()).unwrap();
+
+		let (revoke_msg, commitment_signed) = nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), commitment_signed).unwrap();
+		assert!(commitment_signed.is_none());
+		check_added_monitors_and_clear!(nodes[0]);
+		check_added_monitors_and_clear!(nodes[1]);
+		let (revoke_msg_0, commitment_signed) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &commitment_signed_0).unwrap();
+		assert!(commitment_signed.is_none());
+		check_added_monitors_and_clear!(nodes[0]);
+
+		let resp_option = nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &revoke_msg).unwrap();
+		assert!(resp_option.is_none());
+		check_added_monitors_and_clear!(nodes[0]);
+
+		let resp_option = nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &revoke_msg_0).unwrap();
+		let commitment_signed = resp_option.unwrap().commitment_signed;
+		check_added_monitors_and_clear!(nodes[1]);
+
+		let (revoke_msg, commitment_signed) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &commitment_signed).unwrap();
+		assert!(commitment_signed.is_none());
+		check_added_monitors_and_clear!(nodes[0]);
+		let resp_option = nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &revoke_msg).unwrap();
 		assert!(resp_option.is_none());
+		check_added_monitors_and_clear!(nodes[1]);
 
-		assert_eq!(get_feerate!(nodes[0]), feerate + 20);
-		assert_eq!(get_feerate!(nodes[1]), feerate + 20);
+		assert_eq!(get_feerate!(nodes[0]), feerate + 30);
+		assert_eq!(get_feerate!(nodes[1]), feerate + 30);
 		close_channel(&nodes[0], &nodes[1], &chan.2, chan.3, true);
 	}