f fix no-std

Author: TheBlueMatt

lightning/src/ln/functional_test_utils.rs

@@ -10,7 +10,7 @@
 //! A bunch of useful utilities for building networks of nodes and exchanging messages between
 //! nodes for functional tests.
 
-use crate::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen, Watch, chainmonitor::Persist};
+use crate::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen, Watch};
 use crate::chain::channelmonitor::ChannelMonitor;
 use crate::chain::transaction::OutPoint;
 use crate::events::{ClaimedHTLC, ClosureReason, Event, HTLCDestination, PathFailure, PaymentPurpose, PaymentFailureReason};
@@ -3286,7 +3286,7 @@ pub fn create_node_cfgs<'a>(node_count: usize, chanmon_cfgs: &'a Vec<TestChanMon
 	create_node_cfgs_with_persisters(node_count, chanmon_cfgs, chanmon_cfgs.iter().map(|c| &c.persister).collect())
 }
 
-pub fn create_node_cfgs_with_persisters<'a>(node_count: usize, chanmon_cfgs: &'a Vec<TestChanMonCfg>, persisters: Vec<&'a (impl Persist<TestChannelSigner> + Sync)>) -> Vec<NodeCfg<'a>> {
+pub fn create_node_cfgs_with_persisters<'a>(node_count: usize, chanmon_cfgs: &'a Vec<TestChanMonCfg>, persisters: Vec<&'a impl test_utils::SyncPersist>) -> Vec<NodeCfg<'a>> {
 	let mut nodes = Vec::new();
 
 	for i in 0..node_count {

lightning/src/util/test_utils.rs

@@ -378,17 +378,35 @@ impl SignerProvider for OnlyReadsKeysInterface {
 	}
 }
 
+#[cfg(feature = "std")]
+pub trait SyncBroadcaster : chaininterface::BroadcasterInterface + Sync {}
+#[cfg(feature = "std")]
+pub trait SyncPersist : Persist<TestChannelSigner> + Sync {}
+#[cfg(feature = "std")]
+impl<T: chaininterface::BroadcasterInterface + Sync> SyncBroadcaster for T {}
+#[cfg(feature = "std")]
+impl<T: Persist<TestChannelSigner> + Sync> SyncPersist for T {}
+
+#[cfg(not(feature = "std"))]
+pub trait SyncBroadcaster : chaininterface::BroadcasterInterface {}
+#[cfg(not(feature = "std"))]
+pub trait SyncPersist : Persist<TestChannelSigner> {}
+#[cfg(not(feature = "std"))]
+impl<T: chaininterface::BroadcasterInterface> SyncBroadcaster for T {}
+#[cfg(not(feature = "std"))]
+impl<T: Persist<TestChannelSigner>> SyncPersist for T {}
+
 pub struct TestChainMonitor<'a> {
 	pub added_monitors: Mutex<Vec<(ChannelId, ChannelMonitor<TestChannelSigner>)>>,
 	pub monitor_updates: Mutex<HashMap<ChannelId, Vec<ChannelMonitorUpdate>>>,
 	pub latest_monitor_update_id: Mutex<HashMap<ChannelId, (u64, u64)>>,
 	pub chain_monitor: ChainMonitor<
 		TestChannelSigner,
 		&'a TestChainSource,
-		&'a (dyn chaininterface::BroadcasterInterface + Sync),
+		&'a dyn SyncBroadcaster,
 		&'a TestFeeEstimator,
 		&'a TestLogger,
-		&'a (dyn Persist<TestChannelSigner> + Sync),
+		&'a dyn SyncPersist,
 	>,
 	pub keys_manager: &'a TestKeysInterface,
 	/// If this is set to Some(), the next update_channel call (not watch_channel) must be a
@@ -402,8 +420,8 @@ pub struct TestChainMonitor<'a> {
 impl<'a> TestChainMonitor<'a> {
 	pub fn new(
 		chain_source: Option<&'a TestChainSource>,
-		broadcaster: &'a (dyn chaininterface::BroadcasterInterface + Sync), logger: &'a TestLogger,
-		fee_estimator: &'a TestFeeEstimator, persister: &'a (dyn Persist<TestChannelSigner> + Sync),
+		broadcaster: &'a dyn SyncBroadcaster, logger: &'a TestLogger,
+		fee_estimator: &'a TestFeeEstimator, persister: &'a dyn SyncPersist,
 		keys_manager: &'a TestKeysInterface,
 	) -> Self {
 		Self {