Merge pull request #25 from TheBlueMatt/2021-04-bp-inclusion

[ldk-c-bindings] / lightning-c-bindings / src / c_types / mod.rs

diff --git a/lightning-c-bindings/src/c_types/mod.rs b/lightning-c-bindings/src/c_types/mod.rs
index 6267b80bc2dd007ba9476f76d01127d2b9a74937..83dae2b0c268a8f00553ee95092c1f967059931c 100644 (file)
--- 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) { }