f assert that removed updates are actually ready to be removed

TheBlueMatt · TheBlueMatt · commit 28800bb38afa · 2023-05-24T04:14:28.000Z
diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
@@ -5051,7 +5051,12 @@ impl<Signer: WriteableEcdsaChannelSigner> Channel<Signer> {
 	}
 
 	pub fn complete_all_mon_updates_through(&mut self, update_id: u64) {
-		self.pending_monitor_updates.retain(|upd| upd.update.update_id > update_id);
+		self.pending_monitor_updates.retain(|upd| {
+			if upd.update.update_id <= update_id {
+				assert!(!upd.blocked, "Completed update must have flown");
+				false
+			} else { true }
+		});
 	}
 
 	pub fn complete_one_mon_update(&mut self, update_id: u64) {

Original file line number	Diff line number	Diff line change
`@@ -5051,7 +5051,12 @@ impl<Signer: WriteableEcdsaChannelSigner> Channel<Signer> {`
`5051`	`5051`	`}`
`5052`	`5052`
`5053`	`5053`	`pub fn complete_all_mon_updates_through(&mut self, update_id: u64) {`
`5054`		`- self.pending_monitor_updates.retain(\|upd\| upd.update.update_id > update_id);`
	`5054`	`+ self.pending_monitor_updates.retain(\|upd\| {`
	`5055`	`+ if upd.update.update_id <= update_id {`
	`5056`	`+ assert!(!upd.blocked, "Completed update must have flown");`
	`5057`	`+ false`
	`5058`	`+ } else { true }`
	`5059`	`+ });`
`5055`	`5060`	`}`
`5056`	`5061`
`5057`	`5062`	`pub fn complete_one_mon_update(&mut self, update_id: u64) {`