From 29b171013455ea9030819e856a2afc261df49a35 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 24 Sep 2021 18:44:32 +0000
Subject: [PATCH] Make the custom message traits cloneable as they're deep in
 nested structs

---
 lightning/src/ln/wire.rs                        | 14 +++++++-------
 lightning/src/onion_message/functional_tests.rs |  1 +
 lightning/src/onion_message/messenger.rs        |  1 +
 lightning/src/onion_message/packet.rs           |  4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lightning/src/ln/wire.rs b/lightning/src/ln/wire.rs
index 88e2ad7c1..e982a2aec 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),
@@ -383,13 +383,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;
 }
 
@@ -399,12 +399,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 }
 }
 
@@ -734,7 +734,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 c2d90ad60..1fc96d051 100644
--- a/lightning/src/onion_message/functional_tests.rs
+++ b/lightning/src/onion_message/functional_tests.rs
@@ -373,6 +373,7 @@ fn reply_path() {
 fn invalid_custom_message_type() {
 	let nodes = create_nodes(2);
 
+	#[derive(Clone)]
 	struct InvalidCustomMessage{}
 	impl CustomOnionMessageContents for InvalidCustomMessage {
 		fn tlv_type(&self) -> u64 {
diff --git a/lightning/src/onion_message/messenger.rs b/lightning/src/onion_message/messenger.rs
index 0fe4120d9..283355ae7 100644
--- a/lightning/src/onion_message/messenger.rs
+++ b/lightning/src/onion_message/messenger.rs
@@ -83,6 +83,7 @@ use crate::prelude::*;
 ///     &custom_message_handler
 /// );
 ///
+/// # #[derive(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 d19bd30ed..99d5bc04a 100644
--- a/lightning/src/onion_message/packet.rs
+++ b/lightning/src/onion_message/packet.rs
@@ -114,7 +114,7 @@ pub(super) enum Payload<T: CustomOnionMessageContents> {
 	}
 }
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 /// The contents of an onion message. In the context of offers, this would be the invoice, invoice
 /// request, or invoice error.
 pub enum OnionMessageContents<T: CustomOnionMessageContents> {
@@ -147,7 +147,7 @@ impl<T: CustomOnionMessageContents> Writeable for OnionMessageContents<T> {
 }
 
 /// The contents of a custom onion message.
-pub trait CustomOnionMessageContents: Writeable {
+pub trait CustomOnionMessageContents: Writeable + Clone {
 	/// Returns the TLV type identifying the message contents. MUST be >= 64.
 	fn tlv_type(&self) -> u64;
 }
-- 
2.39.5