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=c4113a9647cf20f64b09d11881a626992d884d55;hp=57b6dcd463c8c994282a120acd60ebca441a21a1;hb=c35ef17b94a8f4e9e019a2b63e0ed22110671b9c;hpb=d7aaec88584beeb1cece72259f68382f2a729440

diff --git a/lightning-c-bindings/src/c_types/mod.rs b/lightning-c-bindings/src/c_types/mod.rs
index 57b6dcd..c4113a9 100644
--- 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,
@@ -160,8 +209,8 @@ impl Drop for Transaction {
 /// Frees the data buffer, if data_is_owned is set and datalen > 0.
 pub extern "C" fn Transaction_free(_res: Transaction) { }
 
-pub(crate) fn bitcoin_to_C_outpoint(outpoint: ::bitcoin::blockdata::transaction::OutPoint) -> crate::chain::transaction::OutPoint {
-	crate::chain::transaction::OutPoint_new(ThirtyTwoBytes { data: outpoint.txid.into_inner() }, outpoint.vout.try_into().unwrap())
+pub(crate) fn bitcoin_to_C_outpoint(outpoint: ::bitcoin::blockdata::transaction::OutPoint) -> crate::lightning::chain::transaction::OutPoint {
+	crate::lightning::chain::transaction::OutPoint_new(ThirtyTwoBytes { data: outpoint.txid.into_inner() }, outpoint.vout.try_into().unwrap())
 }
 
 #[repr(C)]