Merge pull request #17 from TheBlueMatt/2021-04-upstream-confirm

[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 2748734cf6b7cfd25b0d8ddeb8e515bdd4e63a31..c4113a9647cf20f64b09d11881a626992d884d55 100644 (file)
--- a/lightning-c-bindings/src/c_types/mod.rs
+++ b/lightning-c-bindings/src/c_types/mod.rs
@@ -3,7 +3,6 @@
 /// Auto-generated C-mapped types for templated containers
 pub mod derived;
 
-use bitcoin::Script as BitcoinScript;
 use bitcoin::Transaction as BitcoinTransaction;
 use bitcoin::hashes::Hash;
 use bitcoin::secp256k1::key::PublicKey as SecpPublicKey;
@@ -110,6 +109,55 @@ impl Secp256k1Error {
        }
 }
 
+#[repr(C)]
+#[allow(missing_docs)] // If there's no docs upstream, that's good enough for us
+/// Represents an IO Error. Note that some information is lost in the conversion from Rust.
+pub enum IOError {
+       NotFound,
+       PermissionDenied,
+       ConnectionRefused,
+       ConnectionReset,
+       ConnectionAborted,
+       NotConnected,
+       AddrInUse,
+       AddrNotAvailable,
+       BrokenPipe,
+       AlreadyExists,
+       WouldBlock,
+       InvalidInput,
+       InvalidData,
+       TimedOut,
+       WriteZero,
+       Interrupted,
+       Other,
+       UnexpectedEof,
+}
+impl IOError {
+       pub(crate) fn from_rust(err: std::io::Error) -> Self {
+               match err.kind() {
+                       std::io::ErrorKind::NotFound => IOError::NotFound,
+                       std::io::ErrorKind::PermissionDenied => IOError::PermissionDenied,
+                       std::io::ErrorKind::ConnectionRefused => IOError::ConnectionRefused,
+                       std::io::ErrorKind::ConnectionReset => IOError::ConnectionReset,
+                       std::io::ErrorKind::ConnectionAborted => IOError::ConnectionAborted,
+                       std::io::ErrorKind::NotConnected => IOError::NotConnected,
+                       std::io::ErrorKind::AddrInUse => IOError::AddrInUse,
+                       std::io::ErrorKind::AddrNotAvailable => IOError::AddrNotAvailable,
+                       std::io::ErrorKind::BrokenPipe => IOError::BrokenPipe,
+                       std::io::ErrorKind::AlreadyExists => IOError::AlreadyExists,
+                       std::io::ErrorKind::WouldBlock => IOError::WouldBlock,
+                       std::io::ErrorKind::InvalidInput => IOError::InvalidInput,
+                       std::io::ErrorKind::InvalidData => IOError::InvalidData,
+                       std::io::ErrorKind::TimedOut => IOError::TimedOut,
+                       std::io::ErrorKind::WriteZero => IOError::WriteZero,
+                       std::io::ErrorKind::Interrupted => IOError::Interrupted,
+                       std::io::ErrorKind::Other => IOError::Other,
+                       std::io::ErrorKind::UnexpectedEof => IOError::UnexpectedEof,
+                       _ => IOError::Other,
+               }
+       }
+}
+
 #[repr(C)]
 /// A serialized transaction, in (pointer, length) form.
 ///
@@ -139,9 +187,10 @@ impl Transaction {
                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_vec(v: Vec<u8>) -> Self {
-               let datalen = v.len();
-               let data = Box::into_raw(v.into_boxed_slice());
+       pub(crate) fn from_bitcoin(btc: &BitcoinTransaction) -> Self {
+               let vec = ::bitcoin::consensus::encode::serialize(btc);
+               let datalen = vec.len();
+               let data = Box::into_raw(vec.into_boxed_slice());
                Self {
                        data: unsafe { (*data).as_mut_ptr() },
                        datalen,