From ea9eafe5c885b2b298618d8bdc00e1b395af2033 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Wed, 2 Jun 2021 16:22:54 +0000
Subject: [PATCH] Implement Clone for a few additional manually-defined c_types

---
 lightning-c-bindings/src/c_types/mod.rs | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/lightning-c-bindings/src/c_types/mod.rs b/lightning-c-bindings/src/c_types/mod.rs
index b6b1bbf..83dae2b 100644
--- a/lightning-c-bindings/src/c_types/mod.rs
+++ b/lightning-c-bindings/src/c_types/mod.rs
@@ -114,6 +114,7 @@ impl RecoverableSignature {
 }
 
 #[repr(C)]
+#[derive(Copy, Clone)]
 /// Represents an error returned from libsecp256k1 during validation of some secp256k1 data
 pub enum Secp256k1Error {
 	/// Signature failed verification
@@ -153,6 +154,7 @@ impl Secp256k1Error {
 
 #[repr(C)]
 #[allow(missing_docs)] // If there's no docs upstream, that's good enough for us
+#[derive(Clone, Copy, PartialEq)]
 /// Represents an IO Error. Note that some information is lost in the conversion from Rust.
 pub enum IOError {
 	NotFound,
@@ -247,12 +249,7 @@ pub struct Transaction {
 	pub data_is_owned: bool,
 }
 impl Transaction {
-	pub(crate) fn into_bitcoin(&self) -> BitcoinTransaction {
-		if self.datalen == 0 { panic!("0-length buffer can never represent a valid Transaction"); }
-		::bitcoin::consensus::encode::deserialize(unsafe { std::slice::from_raw_parts(self.data, self.datalen) }).unwrap()
-	}
-	pub(crate) fn from_bitcoin(btc: &BitcoinTransaction) -> Self {
-		let vec = ::bitcoin::consensus::encode::serialize(btc);
+	fn from_vec(vec: Vec<u8>) -> Self {
 		let datalen = vec.len();
 		let data = Box::into_raw(vec.into_boxed_slice());
 		Self {
@@ -261,6 +258,14 @@ impl Transaction {
 			data_is_owned: true,
 		}
 	}
+	pub(crate) fn into_bitcoin(&self) -> BitcoinTransaction {
+		if self.datalen == 0 { panic!("0-length buffer can never represent a valid Transaction"); }
+		::bitcoin::consensus::encode::deserialize(unsafe { std::slice::from_raw_parts(self.data, self.datalen) }).unwrap()
+	}
+	pub(crate) fn from_bitcoin(btc: &BitcoinTransaction) -> Self {
+		let vec = ::bitcoin::consensus::encode::serialize(btc);
+		Self::from_vec(vec)
+	}
 }
 impl Drop for Transaction {
 	fn drop(&mut self) {
@@ -269,6 +274,14 @@ impl Drop for Transaction {
 		}
 	}
 }
+impl Clone for Transaction {
+	fn clone(&self) -> Self {
+		let sl = unsafe { std::slice::from_raw_parts(self.data, self.datalen) };
+		let mut v = Vec::new();
+		v.extend_from_slice(&sl);
+		Self::from_vec(v)
+	}
+}
 #[no_mangle]
 /// Frees the data buffer, if data_is_owned is set and datalen > 0.
 pub extern "C" fn Transaction_free(_res: Transaction) { }
-- 
2.39.5