From: Matt Corallo <git@bluematt.me>
Date: Fri, 24 Sep 2021 18:44:32 +0000 (+0000)
Subject: Make the custom message traits cloneable as they're deep in nested structs
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=2459a77de4f61d808e51f76a8a738411725555b1;p=rust-lightning

Make the custom message traits cloneable as they're deep in nested structs
---

diff --git a/lightning/src/ln/wire.rs b/lightning/src/ln/wire.rs
index 4cf5e21c1..a29ced36a 100644
--- a/lightning/src/ln/wire.rs
+++ b/lightning/src/ln/wire.rs
@@ -45,9 +45,9 @@ impl<T> TestEq for T {}
 /// A Lightning message returned by [`read`] when decoding bytes received over the wire. Each
 /// variant contains a message from [`msgs`] or otherwise the message type if unknown.
 #[allow(missing_docs)]
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 #[cfg_attr(test, derive(PartialEq))]
-pub(crate) enum Message<T> where T: core::fmt::Debug + Type + TestEq {
+pub(crate) enum Message<T> where T: Clone + core::fmt::Debug + Type + TestEq {
 	Init(msgs::Init),
 	Error(msgs::ErrorMessage),
 	Warning(msgs::WarningMessage),
@@ -419,13 +419,13 @@ pub(crate) use self::encode::Encode;
 /// Defines a type identifier for sending messages over the wire.
 ///
 /// Messages implementing this trait specify a type and must be [`Writeable`].
-pub trait Type: core::fmt::Debug + Writeable {
+pub trait Type: core::fmt::Debug + Writeable + Clone {
 	/// Returns the type identifying the message payload.
 	fn type_id(&self) -> u16;
 }
 
 #[cfg(test)]
-pub trait Type: core::fmt::Debug + Writeable + PartialEq {
+pub trait Type: core::fmt::Debug + Writeable + Clone + PartialEq {
 	fn type_id(&self) -> u16;
 }
 
@@ -435,12 +435,12 @@ impl Type for () {
 }
 
 #[cfg(test)]
-impl<T: core::fmt::Debug + Writeable + PartialEq> Type for T where T: Encode {
+impl<T: core::fmt::Debug + Writeable + Clone + PartialEq> Type for T where T: Encode {
 	fn type_id(&self) -> u16 { T::TYPE }
 }
 
 #[cfg(not(test))]
-impl<T: core::fmt::Debug + Writeable> Type for T where T: Encode {
+impl<T: core::fmt::Debug + Writeable + Clone> Type for T where T: Encode {
 	fn type_id(&self) -> u16 { T::TYPE }
 }
 
@@ -786,7 +786,7 @@ mod tests {
 		}
 	}
 
-	#[derive(Eq, PartialEq, Debug)]
+	#[derive(Clone, Eq, PartialEq, Debug)]
 	struct TestCustomMessage {}
 
 	const CUSTOM_MESSAGE_TYPE : u16 = 9000;
diff --git a/lightning/src/onion_message/functional_tests.rs b/lightning/src/onion_message/functional_tests.rs
index 56c540057..463b9fea5 100644
--- a/lightning/src/onion_message/functional_tests.rs
+++ b/lightning/src/onion_message/functional_tests.rs
@@ -654,7 +654,7 @@ fn reply_path() {
 fn invalid_custom_message_type() {
 	let nodes = create_nodes(2);
 
-	#[derive(Debug)]
+	#[derive(Debug, Clone)]
 	struct InvalidCustomMessage{}
 	impl OnionMessageContents for InvalidCustomMessage {
 		fn tlv_type(&self) -> u64 {
diff --git a/lightning/src/onion_message/messenger.rs b/lightning/src/onion_message/messenger.rs
index f40a59f2c..395c4a126 100644
--- a/lightning/src/onion_message/messenger.rs
+++ b/lightning/src/onion_message/messenger.rs
@@ -200,8 +200,8 @@ for OnionMessenger<ES, NS, L, NL, MR, OMH, APH, CMH> where
 ///     &keys_manager, &keys_manager, logger, &node_id_lookup, message_router,
 ///     &offers_message_handler, &async_payments_message_handler, &custom_message_handler
 /// );
-
-/// # #[derive(Debug)]
+///
+/// # #[derive(Debug, Clone)]
 /// # struct YourCustomMessage {}
 /// impl Writeable for YourCustomMessage {
 /// 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
diff --git a/lightning/src/onion_message/packet.rs b/lightning/src/onion_message/packet.rs
index f65ed0d53..f2cf3f00d 100644
--- a/lightning/src/onion_message/packet.rs
+++ b/lightning/src/onion_message/packet.rs
@@ -180,7 +180,7 @@ impl<T: OnionMessageContents> Writeable for ParsedOnionMessageContents<T> {
 }
 
 /// The contents of an onion message.
-pub trait OnionMessageContents: Writeable + core::fmt::Debug {
+pub trait OnionMessageContents: Writeable + core::fmt::Debug + Clone {
 	/// Returns the TLV type identifying the message contents. MUST be >= 64.
 	fn tlv_type(&self) -> u64;