Make TestChannelManager Sync

In a coming commit we'll need to hold references to
`TestChannelManager` in threads, requiring that it be `Sync`.

Fairly minor merge conflicts addressed in:
 * `lightning/src/util/test_utils.rs`

Author: TheBlueMatt

lightning-persister/src/test_utils.rs

@@ -113,7 +113,7 @@ pub(crate) fn do_test_data_migration<S: MigratableKVStore, T: MigratableKVStore>
 
 // Integration-test the given KVStore implementation. Test relaying a few payments and check that
 // the persisted data is updated the appropriate number of times.
-pub(crate) fn do_test_store<K: KVStore>(store_0: &K, store_1: &K) {
+pub(crate) fn do_test_store<K: KVStore + Sync>(store_0: &K, store_1: &K) {
 	let chanmon_cfgs = create_chanmon_cfgs(2);
 	let mut node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
 	let chain_mon_0 = test_utils::TestChainMonitor::new(

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, MessageSendEvent, MessageSendEventsProvider, PathFailure, PaymentPurpose, PaymentFailureReason};
@@ -399,7 +399,7 @@ pub struct NodeCfg<'a> {
 	pub override_init_features: Rc<RefCell<Option<InitFeatures>>>,
 }
 
-type TestChannelManager<'node_cfg, 'chan_mon_cfg> = ChannelManager<
+pub(crate) type TestChannelManager<'node_cfg, 'chan_mon_cfg> = ChannelManager<
 	&'node_cfg TestChainMonitor<'chan_mon_cfg>,
 	&'chan_mon_cfg test_utils::TestBroadcaster,
 	&'node_cfg test_utils::TestKeysInterface,
@@ -3259,7 +3259,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>>) -> 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

@@ -335,11 +335,29 @@ impl SignerProvider for OnlyReadsKeysInterface {
 	fn get_shutdown_scriptpubkey(&self) -> Result<ShutdownScript, ()> { Err(()) }
 }
 
+#[cfg(feature = "std")]
+pub trait SyncBroadcaster: chaininterface::BroadcasterInterface + Sync {}
+#[cfg(feature = "std")]
+pub trait SyncPersist: chainmonitor::Persist<TestChannelSigner> + Sync {}
+#[cfg(feature = "std")]
+impl<T: chaininterface::BroadcasterInterface + Sync> SyncBroadcaster for T {}
+#[cfg(feature = "std")]
+impl<T: chainmonitor::Persist<TestChannelSigner> + Sync> SyncPersist for T {}
+
+#[cfg(not(feature = "std"))]
+pub trait SyncBroadcaster: chaininterface::BroadcasterInterface {}
+#[cfg(not(feature = "std"))]
+pub trait SyncPersist: chainmonitor::Persist<TestChannelSigner> {}
+#[cfg(not(feature = "std"))]
+impl<T: chaininterface::BroadcasterInterface> SyncBroadcaster for T {}
+#[cfg(not(feature = "std"))]
+impl<T: chainmonitor::Persist<TestChannelSigner>> SyncPersist for T {}
+
 pub struct TestChainMonitor<'a> {
 	pub added_monitors: Mutex<Vec<(OutPoint, channelmonitor::ChannelMonitor<TestChannelSigner>)>>,
 	pub monitor_updates: Mutex<HashMap<ChannelId, Vec<channelmonitor::ChannelMonitorUpdate>>>,
 	pub latest_monitor_update_id: Mutex<HashMap<ChannelId, (OutPoint, u64, u64)>>,
-	pub chain_monitor: chainmonitor::ChainMonitor<TestChannelSigner, &'a TestChainSource, &'a dyn chaininterface::BroadcasterInterface, &'a TestFeeEstimator, &'a TestLogger, &'a dyn chainmonitor::Persist<TestChannelSigner>>,
+	pub chain_monitor: chainmonitor::ChainMonitor<TestChannelSigner, &'a TestChainSource, &'a dyn SyncBroadcaster, &'a TestFeeEstimator, &'a TestLogger, &'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
 	/// ChannelForceClosed event for the given channel_id with should_broadcast set to the given
@@ -350,7 +368,7 @@ pub struct TestChainMonitor<'a> {
 	pub expect_monitor_round_trip_fail: Mutex<Option<ChannelId>>,
 }
 impl<'a> TestChainMonitor<'a> {
-	pub fn new(chain_source: Option<&'a TestChainSource>, broadcaster: &'a dyn chaininterface::BroadcasterInterface, logger: &'a TestLogger, fee_estimator: &'a TestFeeEstimator, persister: &'a dyn chainmonitor::Persist<TestChannelSigner>, keys_manager: &'a TestKeysInterface) -> Self {
+	pub fn new(chain_source: Option<&'a TestChainSource>, broadcaster: &'a dyn SyncBroadcaster, logger: &'a TestLogger, fee_estimator: &'a TestFeeEstimator, persister: &'a dyn SyncPersist, keys_manager: &'a TestKeysInterface) -> Self {
 		Self {
 			added_monitors: Mutex::new(Vec::new()),
 			monitor_updates: Mutex::new(new_hash_map()),
@@ -1448,18 +1466,19 @@ impl Drop for TestChainSource {
 
 pub struct TestScorer {
 	/// Stores a tuple of (scid, ChannelUsage)
-	scorer_expectations: RefCell<Option<VecDeque<(u64, ChannelUsage)>>>,
+	scorer_expectations: Mutex<Option<VecDeque<(u64, ChannelUsage)>>>,
 }
 
 impl TestScorer {
 	pub fn new() -> Self {
 		Self {
-			scorer_expectations: RefCell::new(None),
+			scorer_expectations: Mutex::new(None),
 		}
 	}
 
 	pub fn expect_usage(&self, scid: u64, expectation: ChannelUsage) {
-		self.scorer_expectations.borrow_mut().get_or_insert_with(|| VecDeque::new()).push_back((scid, expectation));
+		let mut expectations = self.scorer_expectations.lock().unwrap();
+		expectations.get_or_insert_with(|| VecDeque::new()).push_back((scid, expectation));
 	}
 }
 
@@ -1477,7 +1496,7 @@ impl ScoreLookUp for TestScorer {
 			Some(scid) => scid,
 			None => return 0,
 		};
-		if let Some(scorer_expectations) = self.scorer_expectations.borrow_mut().as_mut() {
+		if let Some(scorer_expectations) = self.scorer_expectations.lock().unwrap().as_mut() {
 			match scorer_expectations.pop_front() {
 				Some((scid, expectation)) => {
 					assert_eq!(expectation, usage);
@@ -1511,7 +1530,7 @@ impl Drop for TestScorer {
 			return;
 		}
 
-		if let Some(scorer_expectations) = self.scorer_expectations.borrow().as_ref() {
+		if let Some(scorer_expectations) = self.scorer_expectations.lock().unwrap().as_ref() {
 			if !scorer_expectations.is_empty() {
 				panic!("Unsatisfied scorer expectations: {:?}", scorer_expectations)
 			}