Pin compiler_builtins to 0.1.109 when building std

[ldk-c-bindings] / lightning-c-bindings / src / lightning / util / errors.rs

diff --git a/lightning-c-bindings/src/lightning/util/errors.rs b/lightning-c-bindings/src/lightning/util/errors.rs
index 91ce97343c495bd07bcf2677d9674babca597ce0..884c942b5016c357d29ffeef588de689d5c509b0 100644 (file)
--- a/lightning-c-bindings/src/lightning/util/errors.rs
+++ b/lightning-c-bindings/src/lightning/util/errors.rs
@@ -9,6 +9,7 @@
 //! Error types live here.
 
 use alloc::str::FromStr;
+use alloc::string::String;
 use core::ffi::c_void;
 use core::convert::Infallible;
 use bitcoin::hashes::Hash;
@@ -59,13 +60,13 @@ pub enum APIError {
        /// [`chain::Watch::update_channel`]: crate::chain::Watch::update_channel
        /// [`ChannelMonitorUpdateStatus::InProgress`]: crate::chain::ChannelMonitorUpdateStatus::InProgress
        MonitorUpdateInProgress,
-       /// [`KeysInterface::get_shutdown_scriptpubkey`] returned a shutdown scriptpubkey incompatible
+       /// [`SignerProvider::get_shutdown_scriptpubkey`] returned a shutdown scriptpubkey incompatible
        /// with the channel counterparty as negotiated in [`InitFeatures`].
        ///
        /// Using a SegWit v0 script should resolve this issue. If you cannot, you won't be able to open
        /// a channel or cooperatively close one with this peer (and will have to force-close instead).
        ///
-       /// [`KeysInterface::get_shutdown_scriptpubkey`]: crate::chain::keysinterface::KeysInterface::get_shutdown_scriptpubkey
+       /// [`SignerProvider::get_shutdown_scriptpubkey`]: crate::sign::SignerProvider::get_shutdown_scriptpubkey
        /// [`InitFeatures`]: crate::ln::features::InitFeatures
        IncompatibleShutdownScript {
                /// The incompatible shutdown script.
@@ -96,7 +97,7 @@ impl APIError {
                        APIError::InvalidRoute {ref err, } => {
                                let mut err_nonref = Clone::clone(err);
                                nativeAPIError::InvalidRoute {
-                                       err: err_nonref.into_str(),
+                                       err: err_nonref.into_string(),
                                }
                        },
                        APIError::ChannelUnavailable {ref err, } => {
@@ -130,7 +131,7 @@ impl APIError {
                        },
                        APIError::InvalidRoute {mut err, } => {
                                nativeAPIError::InvalidRoute {
-                                       err: err.into_str(),
+                                       err: err.into_string(),
                                }
                        },
                        APIError::ChannelUnavailable {mut err, } => {
@@ -147,7 +148,8 @@ impl APIError {
                }
        }
        #[allow(unused)]
-       pub(crate) fn from_native(native: &nativeAPIError) -> Self {
+       pub(crate) fn from_native(native: &APIErrorImport) -> Self {
+               let native = unsafe { &*(native as *const _ as *const c_void as *const nativeAPIError) };
                match native {
                        nativeAPIError::APIMisuseError {ref err, } => {
                                let mut err_nonref = Clone::clone(err);
@@ -225,6 +227,16 @@ pub extern "C" fn APIError_free(this_ptr: APIError) { }
 pub extern "C" fn APIError_clone(orig: &APIError) -> APIError {
        orig.clone()
 }
+#[allow(unused)]
+/// Used only if an object of this type is returned as a trait impl by a method
+pub(crate) extern "C" fn APIError_clone_void(this_ptr: *const c_void) -> *mut c_void {
+       Box::into_raw(Box::new(unsafe { (*(this_ptr as *const APIError)).clone() })) as *mut c_void
+}
+#[allow(unused)]
+/// Used only if an object of this type is returned as a trait impl by a method
+pub(crate) extern "C" fn APIError_free_void(this_ptr: *mut c_void) {
+       let _ = unsafe { Box::from_raw(this_ptr as *mut APIError) };
+}
 #[no_mangle]
 /// Utility method to constructs a new APIMisuseError-variant APIError
 pub extern "C" fn APIError_apimisuse_error(err: crate::c_types::Str) -> APIError {
@@ -271,3 +283,22 @@ pub extern "C" fn APIError_incompatible_shutdown_script(script: crate::lightning
 pub extern "C" fn APIError_eq(a: &APIError, b: &APIError) -> bool {
        if &a.to_native() == &b.to_native() { true } else { false }
 }
+/// Get a string which allows debug introspection of a APIError object
+pub extern "C" fn APIError_debug_str_void(o: *const c_void) -> Str {
+       alloc::format!("{:?}", unsafe { o as *const crate::lightning::util::errors::APIError }).into()}
+#[no_mangle]
+/// Serialize the APIError object into a byte array which can be read by APIError_read
+pub extern "C" fn APIError_write(obj: &crate::lightning::util::errors::APIError) -> crate::c_types::derived::CVec_u8Z {
+       crate::c_types::serialize_obj(&unsafe { &*obj }.to_native())
+}
+#[allow(unused)]
+pub(crate) extern "C" fn APIError_write_void(obj: *const c_void) -> crate::c_types::derived::CVec_u8Z {
+       APIError_write(unsafe { &*(obj as *const APIError) })
+}
+#[no_mangle]
+/// Read a APIError from a byte array, created by APIError_write
+pub extern "C" fn APIError_read(ser: crate::c_types::u8slice) -> crate::c_types::derived::CResult_COption_APIErrorZDecodeErrorZ {
+       let res: Result<Option<lightning::util::errors::APIError>, lightning::ln::msgs::DecodeError> = crate::c_types::maybe_deserialize_obj(ser);
+       let mut local_res = match res { Ok(mut o) => crate::c_types::CResultTempl::ok( { let mut local_res_0 = if o.is_none() { crate::c_types::derived::COption_APIErrorZ::None } else { crate::c_types::derived::COption_APIErrorZ::Some( { crate::lightning::util::errors::APIError::native_into(o.unwrap()) }) }; local_res_0 }).into(), Err(mut e) => crate::c_types::CResultTempl::err( { crate::lightning::ln::msgs::DecodeError::native_into(e) }).into() };
+       local_res
+}