Merge pull request #51 from TheBlueMatt/main

[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 8f0432685ee9f4cc9dd80ac8e490dcc884f0e1d3..229fe039961b5aef8a8a47ddc03ce0b6e5c43d5a 100644 (file)
--- a/lightning-c-bindings/src/lightning/util/errors.rs
+++ b/lightning-c-bindings/src/lightning/util/errors.rs
@@ -10,6 +10,7 @@
 
 use std::str::FromStr;
 use std::ffi::c_void;
+use core::convert::Infallible;
 use bitcoin::hashes::Hash;
 use crate::c_types::*;
 
@@ -168,7 +169,7 @@ impl APIError {
                        nativeAPIError::IncompatibleShutdownScript {ref script, } => {
                                let mut script_nonref = (*script).clone();
                                APIError::IncompatibleShutdownScript {
-                                       script: crate::lightning::ln::script::ShutdownScript { inner: Box::into_raw(Box::new(script_nonref)), is_owned: true },
+                                       script: crate::lightning::ln::script::ShutdownScript { inner: ObjOps::heap_alloc(script_nonref), is_owned: true },
                                }
                        },
                }
@@ -200,7 +201,7 @@ impl APIError {
                        nativeAPIError::MonitorUpdateFailed => APIError::MonitorUpdateFailed,
                        nativeAPIError::IncompatibleShutdownScript {mut script, } => {
                                APIError::IncompatibleShutdownScript {
-                                       script: crate::lightning::ln::script::ShutdownScript { inner: Box::into_raw(Box::new(script)), is_owned: true },
+                                       script: crate::lightning::ln::script::ShutdownScript { inner: ObjOps::heap_alloc(script), is_owned: true },
                                }
                        },
                }