X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-c-bindings%2Fsrc%2Fc_types%2Fmod.rs;h=220777636c1eca44f3c043292e4d6e61dd42515b;hb=7ca42fa60cd2d70628238f92be3cc6a89907568c;hp=0c46581f20266e5abe23dfab1e1d151de0d2b40d;hpb=c96981baf087d5441d079508ae71d2e046167ebf;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 0c46581..2207776 100644 --- a/lightning-c-bindings/src/c_types/mod.rs +++ b/lightning-c-bindings/src/c_types/mod.rs @@ -166,6 +166,12 @@ impl BigEndianScalar { } } +#[no_mangle] +/// Convenience function for constructing a new BigEndianScalar +pub extern "C" fn BigEndianScalar_new(big_endian_bytes: ThirtyTwoBytes) -> BigEndianScalar { + BigEndianScalar { big_endian_bytes: big_endian_bytes.data } +} + #[repr(C)] #[derive(Copy, Clone)] /// Represents an error returned from libsecp256k1 during validation of some secp256k1 data @@ -310,8 +316,8 @@ pub enum IOError { UnexpectedEof, } impl IOError { - pub(crate) fn from_rust(err: io::Error) -> Self { - match err.kind() { + pub(crate) fn from_rust_kind(err: io::ErrorKind) -> Self { + match err { io::ErrorKind::NotFound => IOError::NotFound, io::ErrorKind::PermissionDenied => IOError::PermissionDenied, io::ErrorKind::ConnectionRefused => IOError::ConnectionRefused, @@ -333,8 +339,11 @@ impl IOError { _ => IOError::Other, } } - pub(crate) fn to_rust(&self) -> io::Error { - io::Error::new(match self { + pub(crate) fn from_rust(err: io::Error) -> Self { + Self::from_rust_kind(err.kind()) + } + pub(crate) fn to_rust_kind(&self) -> io::ErrorKind { + match self { IOError::NotFound => io::ErrorKind::NotFound, IOError::PermissionDenied => io::ErrorKind::PermissionDenied, IOError::ConnectionRefused => io::ErrorKind::ConnectionRefused, @@ -353,7 +362,10 @@ impl IOError { IOError::Interrupted => io::ErrorKind::Interrupted, IOError::Other => io::ErrorKind::Other, IOError::UnexpectedEof => io::ErrorKind::UnexpectedEof, - }, "") + } + } + pub(crate) fn to_rust(&self) -> io::Error { + io::Error::new(self.to_rust_kind(), "") } }