X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-c-bindings;a=blobdiff_plain;f=lightning-c-bindings%2Fsrc%2Flightning%2Fln%2Fscript.rs;h=fe5c68110db96e0d945e71b0595b3eb811e56e6a;hp=f40f364ce8550fb489d1698ef491be65c88d18a1;hb=1eaf50a3d9f777b462ff1817678473567a00eb75;hpb=a945b11d9f16864753054a47128d71a96de29f73 diff --git a/lightning-c-bindings/src/lightning/ln/script.rs b/lightning-c-bindings/src/lightning/ln/script.rs index f40f364..fe5c681 100644 --- a/lightning-c-bindings/src/lightning/ln/script.rs +++ b/lightning-c-bindings/src/lightning/ln/script.rs @@ -8,11 +8,13 @@ //! Abstractions for scripts used in the Lightning Network. -use std::str::FromStr; -use std::ffi::c_void; +use alloc::str::FromStr; +use core::ffi::c_void; use core::convert::Infallible; use bitcoin::hashes::Hash; use crate::c_types::*; +#[cfg(feature="no-std")] +use alloc::{vec::Vec, boxed::Box}; use lightning::ln::script::ShutdownScript as nativeShutdownScriptImport; @@ -63,14 +65,14 @@ impl ShutdownScript { pub(crate) fn take_inner(mut self) -> *mut nativeShutdownScript { assert!(self.is_owned); let ret = ObjOps::untweak_ptr(self.inner); - self.inner = std::ptr::null_mut(); + self.inner = core::ptr::null_mut(); ret } } impl Clone for ShutdownScript { fn clone(&self) -> Self { Self { - inner: if <*mut nativeShutdownScript>::is_null(self.inner) { std::ptr::null_mut() } else { + inner: if <*mut nativeShutdownScript>::is_null(self.inner) { core::ptr::null_mut() } else { ObjOps::heap_alloc(unsafe { &*ObjOps::untweak_ptr(self.inner) }.clone()) }, is_owned: true, } @@ -133,7 +135,7 @@ impl InvalidShutdownScript { pub(crate) fn take_inner(mut self) -> *mut nativeInvalidShutdownScript { assert!(self.is_owned); let ret = ObjOps::untweak_ptr(self.inner); - self.inner = std::ptr::null_mut(); + self.inner = core::ptr::null_mut(); ret } } @@ -160,6 +162,25 @@ pub extern "C" fn InvalidShutdownScript_new(mut script_arg: crate::c_types::deri script: ::bitcoin::blockdata::script::Script::from(script_arg.into_rust()), }), is_owned: true } } +impl Clone for InvalidShutdownScript { + fn clone(&self) -> Self { + Self { + inner: if <*mut nativeInvalidShutdownScript>::is_null(self.inner) { core::ptr::null_mut() } else { + ObjOps::heap_alloc(unsafe { &*ObjOps::untweak_ptr(self.inner) }.clone()) }, + is_owned: true, + } + } +} +#[allow(unused)] +/// Used only if an object of this type is returned as a trait impl by a method +pub(crate) extern "C" fn InvalidShutdownScript_clone_void(this_ptr: *const c_void) -> *mut c_void { + Box::into_raw(Box::new(unsafe { (*(this_ptr as *mut nativeInvalidShutdownScript)).clone() })) as *mut c_void +} +#[no_mangle] +/// Creates a copy of the InvalidShutdownScript +pub extern "C" fn InvalidShutdownScript_clone(orig: &InvalidShutdownScript) -> InvalidShutdownScript { + orig.clone() +} #[no_mangle] /// Serialize the ShutdownScript object into a byte array which can be read by ShutdownScript_read pub extern "C" fn ShutdownScript_write(obj: &ShutdownScript) -> crate::c_types::derived::CVec_u8Z {