f - test fixups

Author: ViktorTigerstrom

lightning/src/ln/channelmanager.rs

@@ -7819,16 +7819,15 @@ mod tests {
 
 		nodes[1].node.handle_closing_signed(&nodes[0].node.get_our_node_id(), &closing_signed_node_0.unwrap());
 		{
-			// Assert that the channel is removed from both parties `id_to_peer` map once they both
-			// have everything required to fully close the channel.
-			assert_eq!(nodes[0].node.id_to_peer.lock().unwrap().len(), 0);
+			// Assert that the channel has now been removed from both parties `id_to_peer` map once
+			// they both have everything required to fully close the channel.
 			assert_eq!(nodes[1].node.id_to_peer.lock().unwrap().len(), 0);
 		}
 		let (_nodes_1_update, _none) = get_closing_signed_broadcast!(nodes[1].node, nodes[0].node.get_our_node_id());
 
 		// Clear the `ChannelClosed` event for the nodes.
-		nodes[0].node.get_and_clear_pending_events();
-		nodes[1].node.get_and_clear_pending_events();
+		get_event!(&nodes[0], Event::ChannelClosed);
+		get_event!(&nodes[1], Event::ChannelClosed);
 	}
 }