Update bindings branch to 0.0.111 and update rust-bitcoin and secp

[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 471b067ac94fab9d19e1e6f034fdf49d1eea8cc2..3b574073fcdd23fd100e1dcf05bf7e120159098d 100644 (file)
--- a/lightning-c-bindings/src/c_types/mod.rs
+++ b/lightning-c-bindings/src/c_types/mod.rs
@@ -24,6 +24,8 @@ pub(crate) use core2::io::{self, Cursor, Read};
 #[cfg(feature = "no-std")]
 use alloc::{boxed::Box, vec::Vec, string::String};
 
+use core::convert::TryFrom;
+
 #[repr(C)]
 /// A dummy struct of which an instance must never exist.
 /// This corresponds to the Rust type `Infallible`, or, in unstable rust, `!`
@@ -53,10 +55,12 @@ impl Into<bech32::u5> for u5 {
 pub struct WitnessVersion(u8);
 
 impl From<address::WitnessVersion> for WitnessVersion {
-       fn from(o: address::WitnessVersion) -> Self { Self(o.into_num()) }
+       fn from(o: address::WitnessVersion) -> Self { Self(o.to_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") }
+       fn into(self) -> address::WitnessVersion {
+               address::WitnessVersion::try_from(self.0).expect("WitnessVersion objects must be in the range 0..=16")
+       }
 }
 
 #[derive(Clone)]
@@ -288,51 +292,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,
                }, "")
        }
 }