X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-c-bindings;a=blobdiff_plain;f=lightning-c-bindings%2Fsrc%2Fc_types%2Fmod.rs;h=83dae2b0c268a8f00553ee95092c1f967059931c;hp=3d45802e8063850cc2f71983e47daeefce11a304;hb=4e514def04a4aabea8261173311e6c747d4bd133;hpb=1926a7a71ae0f37ebd6562996769334e0af0cf1b

diff --git a/lightning-c-bindings/src/c_types/mod.rs b/lightning-c-bindings/src/c_types/mod.rs
index 3d45802..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,
@@ -198,6 +200,28 @@ impl IOError {
 			_ => IOError::Other,
 		}
 	}
+	pub(crate) fn to_rust(&self) -> std::io::Error {
+		std::io::Error::new(match self {
+			IOError::NotFound => std::io::ErrorKind::NotFound,
+			IOError::PermissionDenied => std::io::ErrorKind::PermissionDenied,
+			IOError::ConnectionRefused => std::io::ErrorKind::ConnectionRefused,
+			IOError::ConnectionReset => std::io::ErrorKind::ConnectionReset,
+			IOError::ConnectionAborted => std::io::ErrorKind::ConnectionAborted,
+			IOError::NotConnected => std::io::ErrorKind::NotConnected,
+			IOError::AddrInUse => std::io::ErrorKind::AddrInUse,
+			IOError::AddrNotAvailable => std::io::ErrorKind::AddrNotAvailable,
+			IOError::BrokenPipe => std::io::ErrorKind::BrokenPipe,
+			IOError::AlreadyExists => std::io::ErrorKind::AlreadyExists,
+			IOError::WouldBlock => std::io::ErrorKind::WouldBlock,
+			IOError::InvalidInput => std::io::ErrorKind::InvalidInput,
+			IOError::InvalidData => std::io::ErrorKind::InvalidData,
+			IOError::TimedOut => std::io::ErrorKind::TimedOut,
+			IOError::WriteZero => std::io::ErrorKind::WriteZero,
+			IOError::Interrupted => std::io::ErrorKind::Interrupted,
+			IOError::Other => std::io::ErrorKind::Other,
+			IOError::UnexpectedEof => std::io::ErrorKind::UnexpectedEof,
+		}, "")
+	}
 }
 
 #[repr(C)]
@@ -225,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 {
@@ -239,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) {
@@ -247,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) { }
@@ -387,13 +422,15 @@ impl Str {
 		if self.len == 0 { return ""; }
 		std::str::from_utf8(unsafe { std::slice::from_raw_parts(self.chars, self.len) }).unwrap()
 	}
-	pub(crate) fn into_string(self) -> String {
+	pub(crate) fn into_string(mut self) -> String {
 		let bytes = if self.len == 0 {
 			Vec::new()
 		} else if self.chars_is_owned {
-			unsafe {
+			let ret = unsafe {
 				Box::from_raw(std::slice::from_raw_parts_mut(unsafe { self.chars as *mut u8 }, self.len))
-			}.into()
+			}.into();
+			self.chars_is_owned = false;
+			ret
 		} else {
 			let mut ret = Vec::with_capacity(self.len);
 			ret.extend_from_slice(unsafe { std::slice::from_raw_parts(self.chars, self.len) });