From: Matt Corallo <git@bluematt.me>
Date: Sun, 18 Jun 2023 23:18:34 +0000 (+0000)
Subject: Drop the now-unused `push_blockable_mon_update`
X-Git-Tag: v0.0.116-alpha1~3^2~6
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=5e528ff6bb141ea1044114128406b6a6b194c4b1;p=rust-lightning

Drop the now-unused `push_blockable_mon_update`
---

diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index df0ebcbd7..26b70f286 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -4449,22 +4449,14 @@ impl<Signer: WriteableEcdsaChannelSigner> Channel<Signer> {
 		None
 	}
 
-	/// Pushes a new monitor update into our monitor update queue, returning whether it should be
-	/// immediately given to the user for persisting or if it should be held as blocked.
-	fn push_blockable_mon_update(&mut self, update: ChannelMonitorUpdate) -> bool {
+	/// Pushes a new monitor update into our monitor update queue, returning it if it should be
+	/// immediately given to the user for persisting or `None` if it should be held as blocked.
+	fn push_ret_blockable_mon_update(&mut self, update: ChannelMonitorUpdate)
+	-> Option<ChannelMonitorUpdate> {
 		let release_monitor = self.context.pending_monitor_updates.iter().all(|upd| !upd.blocked);
 		self.context.pending_monitor_updates.push(PendingChannelMonitorUpdate {
-			update, blocked: !release_monitor
+			update, blocked: !release_monitor,
 		});
-		release_monitor
-	}
-
-	/// Pushes a new monitor update into our monitor update queue, returning a reference to it if
-	/// it should be immediately given to the user for persisting or `None` if it should be held as
-	/// blocked.
-	fn push_ret_blockable_mon_update(&mut self, update: ChannelMonitorUpdate)
-	-> Option<ChannelMonitorUpdate> {
-		let release_monitor = self.push_blockable_mon_update(update);
 		if release_monitor { self.context.pending_monitor_updates.last().map(|upd| upd.update.clone()) } else { None }
 	}