X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-c-bindings%2Fsrc%2Fc_types%2Fmod.rs;h=f706b952456bce87448e707edc32526cdddb7ade;hb=9c6d1f18819e09bcb6842f709757dbe41f31132b;hp=71aa6793cc25c9c3f2de853dedb9de0ff90e5f2b;hpb=8af4116fe7c878945f08c85e5040cb24a6d26c55;p=ldk-c-bindings

diff --git a/lightning-c-bindings/src/c_types/mod.rs b/lightning-c-bindings/src/c_types/mod.rs
index 71aa679..f706b95 100644
--- a/lightning-c-bindings/src/c_types/mod.rs
+++ b/lightning-c-bindings/src/c_types/mod.rs
@@ -12,6 +12,7 @@ use bitcoin::secp256k1::Error as SecpError;
 use bitcoin::secp256k1::ecdsa::RecoveryId;
 use bitcoin::secp256k1::ecdsa::RecoverableSignature as SecpRecoverableSignature;
 use bitcoin::bech32;
+use bitcoin::util::address;
 
 use core::convert::TryInto; // Bindings need at least rustc 1.34
 use core::ffi::c_void;
@@ -46,6 +47,18 @@ impl Into<bech32::u5> for u5 {
 	fn into(self) -> bech32::u5 { bech32::u5::try_from_u8(self.0).expect("u5 objects must be in the range 0..32") }
 }
 
+/// Integer in the range `0..=16`
+#[derive(PartialEq, Eq, Copy, Clone)]
+#[repr(C)]
+pub struct WitnessVersion(u8);
+
+impl From<address::WitnessVersion> for WitnessVersion {
+	fn from(o: address::WitnessVersion) -> Self { Self(o.into_num()) }
+}
+impl Into<address::WitnessVersion> for WitnessVersion {
+	fn into(self) -> address::WitnessVersion { address::WitnessVersion::from_num(self.0).expect("WitnessVersion objects must be in the range 0..=16") }
+}
+
 #[derive(Clone)]
 #[repr(C)]
 /// Represents a valid secp256k1 public key serialized in "compressed form" as a 33 byte array.
@@ -275,51 +288,50 @@ pub enum IOError {
 	Other,
 	UnexpectedEof,
 }
-#[cfg(feature = "std")]
 impl IOError {
-	pub(crate) fn from_rust(err: std::io::Error) -> Self {
+	pub(crate) fn from_rust(err: 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,
+			io::ErrorKind::NotFound => IOError::NotFound,
+			io::ErrorKind::PermissionDenied => IOError::PermissionDenied,
+			io::ErrorKind::ConnectionRefused => IOError::ConnectionRefused,
+			io::ErrorKind::ConnectionReset => IOError::ConnectionReset,
+			io::ErrorKind::ConnectionAborted => IOError::ConnectionAborted,
+			io::ErrorKind::NotConnected => IOError::NotConnected,
+			io::ErrorKind::AddrInUse => IOError::AddrInUse,
+			io::ErrorKind::AddrNotAvailable => IOError::AddrNotAvailable,
+			io::ErrorKind::BrokenPipe => IOError::BrokenPipe,
+			io::ErrorKind::AlreadyExists => IOError::AlreadyExists,
+			io::ErrorKind::WouldBlock => IOError::WouldBlock,
+			io::ErrorKind::InvalidInput => IOError::InvalidInput,
+			io::ErrorKind::InvalidData => IOError::InvalidData,
+			io::ErrorKind::TimedOut => IOError::TimedOut,
+			io::ErrorKind::WriteZero => IOError::WriteZero,
+			io::ErrorKind::Interrupted => IOError::Interrupted,
+			io::ErrorKind::Other => IOError::Other,
+			io::ErrorKind::UnexpectedEof => IOError::UnexpectedEof,
 			_ => 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,
+	pub(crate) fn to_rust(&self) -> io::Error {
+		io::Error::new(match self {
+			IOError::NotFound => io::ErrorKind::NotFound,
+			IOError::PermissionDenied => io::ErrorKind::PermissionDenied,
+			IOError::ConnectionRefused => io::ErrorKind::ConnectionRefused,
+			IOError::ConnectionReset => io::ErrorKind::ConnectionReset,
+			IOError::ConnectionAborted => io::ErrorKind::ConnectionAborted,
+			IOError::NotConnected => io::ErrorKind::NotConnected,
+			IOError::AddrInUse => io::ErrorKind::AddrInUse,
+			IOError::AddrNotAvailable => io::ErrorKind::AddrNotAvailable,
+			IOError::BrokenPipe => io::ErrorKind::BrokenPipe,
+			IOError::AlreadyExists => io::ErrorKind::AlreadyExists,
+			IOError::WouldBlock => io::ErrorKind::WouldBlock,
+			IOError::InvalidInput => io::ErrorKind::InvalidInput,
+			IOError::InvalidData => io::ErrorKind::InvalidData,
+			IOError::TimedOut => io::ErrorKind::TimedOut,
+			IOError::WriteZero => io::ErrorKind::WriteZero,
+			IOError::Interrupted => io::ErrorKind::Interrupted,
+			IOError::Other => io::ErrorKind::Other,
+			IOError::UnexpectedEof => io::ErrorKind::UnexpectedEof,
 		}, "")
 	}
 }