f sp and additional test

Author: TheBlueMatt

lightning/src/chain/chainmonitor.rs

@@ -787,7 +787,7 @@ mod tests {
 	#[test]
 	fn test_async_ooo_offchain_updates() {
 		// Test that if we have multiple offchain updates being persisted and they complete
-		// out-of-order, the ChainMonitor waits until all have completed until informing the
+		// out-of-order, the ChainMonitor waits until all have completed before informing the
 		// ChannelManager.
 		let chanmon_cfgs = create_chanmon_cfgs(2);
 		let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
@@ -815,10 +815,11 @@ mod tests {
 		assert_eq!(updates.len(), 2);
 
 		// Note that updates is a HashMap so the ordering here is actually random. This shouldn't
-		// fail either way but if it fails intermittently its depending on the ordering of updates.
+		// fail either way but if it fails intermittently it's depending on the ordering of updates.
 		let mut update_iter = updates.iter();
 		nodes[1].chain_monitor.chain_monitor.channel_monitor_updated(*funding_txo, update_iter.next().unwrap().clone()).unwrap();
 		assert!(nodes[1].chain_monitor.release_pending_monitor_events().is_empty());
+		assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 		nodes[1].chain_monitor.chain_monitor.channel_monitor_updated(*funding_txo, update_iter.next().unwrap().clone()).unwrap();
 
 		// Now manually walk the commitment signed dance - because we claimed two payments