Add Arc to Mutex fields to make them cloneable

Author: optout21

lightning/src/ln/channel.rs

@@ -4818,11 +4818,13 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 		self.get_initial_counterparty_commitment_signature(funding, logger)
 	}
 
-	/// Clone, each field, with a few exceptions, notably the channel signer, and
-	/// a few non-cloneable fields (such as Secp256k1 context)
+	/// Clone, each field, with the exception of the channel signer.
 	#[allow(unused)]
 	fn clone(&self, holder_signer: <SP::Target as SignerProvider>::EcdsaSigner) -> Self {
 		Self {
+			// Use provided channel signer
+			holder_signer: ChannelSignerType::Ecdsa(holder_signer),
+
 			config: self.config,
 			prev_config: self.prev_config,
 			inbound_handshake_limits_override: self.inbound_handshake_limits_override,
@@ -4831,12 +4833,9 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 			temporary_channel_id: self.temporary_channel_id,
 			channel_state: self.channel_state,
 			announcement_sigs_state: self.announcement_sigs_state.clone(),
-			// Create new Secp256k context
-			secp_ctx: Secp256k1::new(),
+			secp_ctx: self.secp_ctx.clone(),
 			// channel_value_satoshis: self.channel_value_satoshis,
 			latest_monitor_update_id: self.latest_monitor_update_id,
-			// Use provided channel signer
-			holder_signer: ChannelSignerType::Ecdsa(holder_signer),
 			shutdown_scriptpubkey: self.shutdown_scriptpubkey.clone(),
 			destination_script: self.destination_script.clone(),
 			// holder_commitment_point: self.holder_commitment_point,
@@ -4867,9 +4866,9 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 			update_time_counter: self.update_time_counter,
 			// Create new mutex with copied values
 			// #[cfg(debug_assertions)]
-			// holder_max_commitment_tx_output: Mutex::new(*self.holder_max_commitment_tx_output.lock().unwrap()),
+			// holder_max_commitment_tx_output: self.holder_max_commitment_tx_output.clone(),
 			// #[cfg(debug_assertions)]
-			// counterparty_max_commitment_tx_output: Mutex::new(*self.counterparty_max_commitment_tx_output.lock().unwrap()),
+			// counterparty_max_commitment_tx_output: self.counterparty_max_commitment_tx_output.clone(),
 			last_sent_closing_fee: self.last_sent_closing_fee.clone(),
 			last_received_closing_sig: self.last_received_closing_sig,
 			target_closing_feerate_sats_per_kw: self.target_closing_feerate_sats_per_kw,
@@ -4906,9 +4905,9 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 			announcement_sigs: self.announcement_sigs,
 			// Create new mutex with copied values
 			// #[cfg(any(test, fuzzing))]
-			// next_local_commitment_tx_fee_info_cached: Mutex::new(self.next_local_commitment_tx_fee_info_cached.lock().unwrap().clone()),
+			// next_local_commitment_tx_fee_info_cached: self.next_local_commitment_tx_fee_info_cached.clone(),
 			// #[cfg(any(test, fuzzing))]
-			// next_remote_commitment_tx_fee_info_cached: Mutex::new(self.next_remote_commitment_tx_fee_info_cached.lock().unwrap().clone()),
+			// next_remote_commitment_tx_fee_info_cached: self.next_remote_commitment_tx_fee_info_cached.clone(),
 			workaround_lnd_bug_4006: self.workaround_lnd_bug_4006.clone(),
 			sent_message_awaiting_response: self.sent_message_awaiting_response,
 			channel_type: self.channel_type.clone(),