X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-background-processor%2Fsrc%2Flib.rs;h=484439b3907b364dddc3dc2c13bb6c078be2ad0c;hb=834fe6357da0b7e2c9f546c156b0ecc0d1006185;hp=b2edc2301efda2b39224cf557b82b313ef46890f;hpb=c032e2888b3ab11838d9d53e7820b060ea0dd0e8;p=rust-lightning

diff --git a/lightning-background-processor/src/lib.rs b/lightning-background-processor/src/lib.rs
index b2edc230..484439b3 100644
--- a/lightning-background-processor/src/lib.rs
+++ b/lightning-background-processor/src/lib.rs
@@ -79,7 +79,7 @@ const PING_TIMER: u64 = 1;
 /// Prune the network graph of stale entries hourly.
 const NETWORK_PRUNE_TIMER: u64 = 60 * 60;
 
-#[cfg(all(not(test), debug_assertions))]
+#[cfg(not(test))]
 const SCORER_PERSIST_TIMER: u64 = 30;
 #[cfg(test)]
 const SCORER_PERSIST_TIMER: u64 = 1;
@@ -137,6 +137,55 @@ where A::Target: chain::Access, L::Target: Logger {
 	}
 }
 
+/// (C-not exported) as the bindings concretize everything and have constructors for us
+impl<P: Deref<Target = P2PGossipSync<G, A, L>>, G: Deref<Target = NetworkGraph<L>>, A: Deref, L: Deref>
+	GossipSync<P, &RapidGossipSync<G, L>, G, A, L>
+where
+	A::Target: chain::Access,
+	L::Target: Logger,
+{
+	/// Initializes a new [`GossipSync::P2P`] variant.
+	pub fn p2p(gossip_sync: P) -> Self {
+		GossipSync::P2P(gossip_sync)
+	}
+}
+
+/// (C-not exported) as the bindings concretize everything and have constructors for us
+impl<'a, R: Deref<Target = RapidGossipSync<G, L>>, G: Deref<Target = NetworkGraph<L>>, L: Deref>
+	GossipSync<
+		&P2PGossipSync<G, &'a (dyn chain::Access + Send + Sync), L>,
+		R,
+		G,
+		&'a (dyn chain::Access + Send + Sync),
+		L,
+	>
+where
+	L::Target: Logger,
+{
+	/// Initializes a new [`GossipSync::Rapid`] variant.
+	pub fn rapid(gossip_sync: R) -> Self {
+		GossipSync::Rapid(gossip_sync)
+	}
+}
+
+/// (C-not exported) as the bindings concretize everything and have constructors for us
+impl<'a, L: Deref>
+	GossipSync<
+		&P2PGossipSync<&'a NetworkGraph<L>, &'a (dyn chain::Access + Send + Sync), L>,
+		&RapidGossipSync<&'a NetworkGraph<L>, L>,
+		&'a NetworkGraph<L>,
+		&'a (dyn chain::Access + Send + Sync),
+		L,
+	>
+where
+	L::Target: Logger,
+{
+	/// Initializes a new [`GossipSync::None`] variant.
+	pub fn none() -> Self {
+		GossipSync::None
+	}
+}
+
 /// Decorates an [`EventHandler`] with common functionality provided by standard [`EventHandler`]s.
 struct DecoratingEventHandler<
 	'a,
@@ -202,7 +251,7 @@ impl BackgroundProcessor {
 	///
 	/// # Rapid Gossip Sync
 	///
-	/// If rapid gossip sync is meant to run at startup, pass a [`RapidGossipSync`] to `gossip_sync`
+	/// If rapid gossip sync is meant to run at startup, pass [`RapidGossipSync`] via `gossip_sync`
 	/// to indicate that the [`BackgroundProcessor`] should not prune the [`NetworkGraph`] instance
 	/// until the [`RapidGossipSync`] instance completes its first sync.
 	///
@@ -744,7 +793,7 @@ mod tests {
 		}
 
 		// Force-close the channel.
-		nodes[0].node.force_close_channel(&OutPoint { txid: tx.txid(), index: 0 }.to_channel_id(), &nodes[1].node.get_our_node_id()).unwrap();
+		nodes[0].node.force_close_broadcasting_latest_txn(&OutPoint { txid: tx.txid(), index: 0 }.to_channel_id(), &nodes[1].node.get_our_node_id()).unwrap();
 
 		// Check that the force-close updates are persisted.
 		check_persisted_data!(nodes[0].node, filepath.clone());
@@ -880,7 +929,7 @@ mod tests {
 		let bg_processor = BackgroundProcessor::start(persister, event_handler, nodes[0].chain_monitor.clone(), nodes[0].node.clone(), nodes[0].no_gossip_sync(), nodes[0].peer_manager.clone(), nodes[0].logger.clone(), Some(nodes[0].scorer.clone()));
 
 		// Force close the channel and check that the SpendableOutputs event was handled.
-		nodes[0].node.force_close_channel(&nodes[0].node.list_channels()[0].channel_id, &nodes[1].node.get_our_node_id()).unwrap();
+		nodes[0].node.force_close_broadcasting_latest_txn(&nodes[0].node.list_channels()[0].channel_id, &nodes[1].node.get_our_node_id()).unwrap();
 		let commitment_tx = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().pop().unwrap();
 		confirm_transaction_depth(&mut nodes[0], &commitment_tx, BREAKDOWN_TIMEOUT as u32);
 		let event = receiver