From: Elias Rohrer <dev@tnull.de>
Date: Thu, 10 Oct 2024 15:16:18 +0000 (+0200)
Subject: Fix `synchronize_listeners` calling default implementation
X-Git-Tag: v0.0.125^2~4
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=a675d48cd4bb2c697ffb3be3c9f6103dd5ded5f1;p=rust-lightning

Fix `synchronize_listeners` calling default implementation

Previously, the `ChainListenerSet` `Listen` implementation wouldn't
forward to the listeners `block_connected` implementation outside of
tests. This would result in the default implementation of
`Listen::block_connected` being used and the listeners implementation
never being called.
---

diff --git a/lightning-block-sync/src/init.rs b/lightning-block-sync/src/init.rs
index 623f54042..ef7e4b5f9 100644
--- a/lightning-block-sync/src/init.rs
+++ b/lightning-block-sync/src/init.rs
@@ -235,8 +235,6 @@ impl<'a, L: chain::Listen + ?Sized> chain::Listen for DynamicChainListener<'a, L
 struct ChainListenerSet<'a, L: chain::Listen + ?Sized>(Vec<(u32, &'a L)>);
 
 impl<'a, L: chain::Listen + ?Sized> chain::Listen for ChainListenerSet<'a, L> {
-	// Needed to differentiate test expectations.
-	#[cfg(test)]
 	fn block_connected(&self, block: &bitcoin::Block, height: u32) {
 		for (starting_height, chain_listener) in self.0.iter() {
 			if height > *starting_height {