Require several additional traits to be Clone

In 0.2 we added some places where `Clone` bounds on traits provided
additional features. The bindings, of course, cannot capture such
optionality as traits have to be concretized first.

Thus, we add the `Clone` bounds explicitly on the traits
themselves.

Author: TheBlueMatt

lightning-persister/src/fs_store.rs

@@ -53,12 +53,13 @@ struct FilesystemStoreInner {
 /// A [`KVStore`] and [`KVStoreSync`] implementation that writes to and reads from the file system.
 ///
 /// [`KVStore`]: lightning::util::persist::KVStore
+#[derive(Clone)]
 pub struct FilesystemStore {
 	inner: Arc<FilesystemStoreInner>,
 
 	// Version counter to ensure that writes are applied in the correct order. It is assumed that read and list
 	// operations aren't sensitive to the order of execution.
-	next_version: AtomicU64,
+	next_version: Arc<AtomicU64>,
 }
 
 impl FilesystemStore {
@@ -68,7 +69,7 @@ impl FilesystemStore {
 		let tmp_file_counter = AtomicUsize::new(0);
 		Self {
 			inner: Arc::new(FilesystemStoreInner { data_dir, tmp_file_counter, locks }),
-			next_version: AtomicU64::new(1),
+			next_version: Arc::new(AtomicU64::new(1)),
 		}
 	}
 

lightning/src/chain/chaininterface.rs

@@ -28,7 +28,7 @@ pub(crate) const fn fee_for_weight(feerate_sat_per_1000_weight: u32, weight: u64
 }
 
 /// An interface to send a transaction to the Bitcoin network.
-pub trait BroadcasterInterface {
+pub trait BroadcasterInterface : Clone {
 	/// Sends a list of transactions out to (hopefully) be mined.
 	/// This only needs to handle the actual broadcasting of transactions, LDK will automatically
 	/// rebroadcast transactions that haven't made it into a block.

lightning/src/chain/channelmonitor.rs

@@ -1832,6 +1832,17 @@ where
 	payment_hash: Option<PaymentHash>,
 }
 
+impl<'a, L: Deref> Clone for WithChannelMonitor<'a, L> where L::Target: Logger {
+	fn clone(&self) -> Self {
+		Self {
+			logger: self.logger,
+			peer_id: self.peer_id,
+			channel_id: self.channel_id,
+			payment_hash: self.payment_hash,
+		}
+	}
+}
+
 impl<'a, L: Deref> Logger for WithChannelMonitor<'a, L>
 where
 	L::Target: Logger,

lightning/src/ln/channel.rs

@@ -968,6 +968,17 @@ where
 	pub payment_hash: Option<PaymentHash>,
 }
 
+impl<'a, L: Deref> Clone for WithChannelContext<'a, L> where L::Target: Logger {
+	fn clone(&self) -> Self {
+		Self {
+			logger: self.logger,
+			peer_id: self.peer_id,
+			channel_id: self.channel_id,
+			payment_hash: self.payment_hash,
+		}
+	}
+}
+
 impl<'a, L: Deref> Logger for WithChannelContext<'a, L>
 where
 	L::Target: Logger,

lightning/src/ln/channelmanager.rs

@@ -2694,9 +2694,9 @@ pub struct ChannelManager<
 	router: R,
 
 	#[cfg(test)]
-	pub(super) flow: OffersMessageFlow<MR, L>,
+	pub(super) flow: OffersMessageFlow<MR, Box<L::Target>>,
 	#[cfg(not(test))]
-	flow: OffersMessageFlow<MR, L>,
+	flow: OffersMessageFlow<MR, Box<L::Target>>,
 
 	/// See `ChannelManager` struct-level documentation for lock order requirements.
 	#[cfg(any(test, feature = "_test_utils"))]
@@ -2718,7 +2718,7 @@ pub struct ChannelManager<
 	/// See `PendingOutboundPayment` documentation for more info.
 	///
 	/// See `ChannelManager` struct-level documentation for lock order requirements.
-	pending_outbound_payments: OutboundPayments<L>,
+	pending_outbound_payments: OutboundPayments<Box<L::Target>>,
 
 	/// SCID/SCID Alias -> forward infos. Key of 0 means payments received.
 	///
@@ -3948,10 +3948,7 @@ where
 		fee_est: F, chain_monitor: M, tx_broadcaster: T, router: R, message_router: MR, logger: L,
 		entropy_source: ES, node_signer: NS, signer_provider: SP, config: UserConfig,
 		params: ChainParameters, current_timestamp: u32,
-	) -> Self
-	where
-		L: Clone,
-	{
+	) -> Self {
 		let mut secp_ctx = Secp256k1::new();
 		secp_ctx.seeded_randomize(&entropy_source.get_secure_random_bytes());
 
@@ -3961,7 +3958,7 @@ where
 		let flow = OffersMessageFlow::new(
 			ChainHash::using_genesis_block(params.network), params.best_block,
 			our_network_pubkey, current_timestamp, expanded_inbound_key,
-			node_signer.get_receive_auth_key(), message_router, logger.clone(),
+			node_signer.get_receive_auth_key(), message_router, Box::new((*logger).clone()),
 		);
 
 		ChannelManager {
@@ -3976,7 +3973,7 @@ where
 			best_block: RwLock::new(params.best_block),
 
 			outbound_scid_aliases: Mutex::new(new_hash_set()),
-			pending_outbound_payments: OutboundPayments::new(new_hash_map(), logger.clone()),
+			pending_outbound_payments: OutboundPayments::new(new_hash_map(), Box::new((*logger).clone())),
 			forward_htlcs: Mutex::new(new_hash_map()),
 			decode_update_add_htlcs: Mutex::new(new_hash_map()),
 			claimable_payments: Mutex::new(ClaimablePayments { claimable_payments: new_hash_map(), pending_claiming_payments: new_hash_map() }),
@@ -17151,7 +17148,7 @@ where
 			pending_outbound_payments = Some(outbounds);
 		}
 		let pending_outbounds =
-			OutboundPayments::new(pending_outbound_payments.unwrap(), args.logger.clone());
+			OutboundPayments::new(pending_outbound_payments.unwrap(), Box::new((*args.logger).clone()));
 
 		for (peer_pubkey, peer_storage) in peer_storage_dir {
 			if let Some(peer_state) = per_peer_state.get_mut(&peer_pubkey) {
@@ -17997,7 +17994,7 @@ where
 			expanded_inbound_key,
 			args.node_signer.get_receive_auth_key(),
 			args.message_router,
-			args.logger.clone(),
+			Box::new((*args.logger).clone()),
 		)
 		.with_async_payments_offers_cache(async_receive_offer_cache);
 

lightning/src/ln/invoice_utils.rs

@@ -600,6 +600,15 @@ where
 	details: &'b ChannelDetails,
 }
 
+impl<'a, 'b, L: Deref> Clone for WithChannelDetails<'a, 'b, L> where L::Target: Logger {
+	fn clone(&self) -> Self {
+		Self {
+			logger: self.logger,
+			details: self.details,
+		}
+	}
+}
+
 impl<'a, 'b, L: Deref> Logger for WithChannelDetails<'a, 'b, L>
 where
 	L::Target: Logger,

lightning/src/util/logger.rs

@@ -159,7 +159,7 @@ impl_record!('a, );
 impl_record!(, 'a);
 
 /// A trait encapsulating the operations required of a logger.
-pub trait Logger {
+pub trait Logger: Clone {
 	/// Logs the [`Record`].
 	fn log(&self, record: Record);
 }
@@ -182,6 +182,17 @@ where
 	payment_hash: Option<PaymentHash>,
 }
 
+impl<'a, L: Deref> Clone for WithContext<'a, L> where L::Target: Logger {
+	fn clone(&self) -> Self {
+		WithContext {
+			logger: self.logger,
+			peer_id: self.peer_id,
+			channel_id: self.channel_id,
+			payment_hash: self.payment_hash,
+		}
+	}
+}
+
 impl<'a, L: Deref> Logger for WithContext<'a, L>
 where
 	L::Target: Logger,

lightning/src/util/persist.rs

@@ -142,7 +142,7 @@ pub const MONITOR_UPDATING_PERSISTER_PREPEND_SENTINEL: &[u8] = &[0xFF; 2];
 ///
 /// For an asynchronous version of this trait, see [`KVStore`].
 // Note that updates to documentation on this trait should be copied to the asynchronous version.
-pub trait KVStoreSync {
+pub trait KVStoreSync : Clone {
 	/// Returns the data stored for the given `primary_namespace`, `secondary_namespace`, and
 	/// `key`.
 	///
@@ -339,7 +339,7 @@ pub trait KVStore {
 
 /// Provides additional interface methods that are required for [`KVStore`]-to-[`KVStore`]
 /// data migration.
-pub trait MigratableKVStore: KVStoreSync {
+pub trait MigratableKVStore: KVStoreSync + Clone {
 	/// Returns *all* known keys as a list of `primary_namespace`, `secondary_namespace`, `key` tuples.
 	///
 	/// This is useful for migrating data from [`KVStoreSync`] implementation to [`KVStoreSync`]