X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-c-bindings%2Fsrc%2Flightning%2Fln%2Fscript.rs;h=f40f364ce8550fb489d1698ef491be65c88d18a1;hb=a945b11d9f16864753054a47128d71a96de29f73;hp=0151ae22602b8fe4a4c6c4e386568c6d0de8d51c;hpb=b187ebbabe60d2ef884c5eadce93fef52674923d;p=ldk-c-bindings diff --git a/lightning-c-bindings/src/lightning/ln/script.rs b/lightning-c-bindings/src/lightning/ln/script.rs index 0151ae2..f40f364 100644 --- a/lightning-c-bindings/src/lightning/ln/script.rs +++ b/lightning-c-bindings/src/lightning/ln/script.rs @@ -16,7 +16,7 @@ use crate::c_types::*; use lightning::ln::script::ShutdownScript as nativeShutdownScriptImport; -type nativeShutdownScript = nativeShutdownScriptImport; +pub(crate) type nativeShutdownScript = nativeShutdownScriptImport; /// A script pubkey for shutting down a channel as defined by [BOLT #2]. /// @@ -48,7 +48,7 @@ impl Drop for ShutdownScript { pub extern "C" fn ShutdownScript_free(this_obj: ShutdownScript) { } #[allow(unused)] /// Used only if an object of this type is returned as a trait impl by a method -extern "C" fn ShutdownScript_free_void(this_ptr: *mut c_void) { +pub(crate) extern "C" fn ShutdownScript_free_void(this_ptr: *mut c_void) { unsafe { let _ = Box::from_raw(this_ptr as *mut nativeShutdownScript); } } #[allow(unused)] @@ -88,7 +88,7 @@ pub extern "C" fn ShutdownScript_clone(orig: &ShutdownScript) -> ShutdownScript } use lightning::ln::script::InvalidShutdownScript as nativeInvalidShutdownScriptImport; -type nativeInvalidShutdownScript = nativeInvalidShutdownScriptImport; +pub(crate) type nativeInvalidShutdownScript = nativeInvalidShutdownScriptImport; /// An error occurring when converting from [`Script`] to [`ShutdownScript`]. #[must_use] @@ -118,7 +118,7 @@ impl Drop for InvalidShutdownScript { pub extern "C" fn InvalidShutdownScript_free(this_obj: InvalidShutdownScript) { } #[allow(unused)] /// Used only if an object of this type is returned as a trait impl by a method -extern "C" fn InvalidShutdownScript_free_void(this_ptr: *mut c_void) { +pub(crate) extern "C" fn InvalidShutdownScript_free_void(this_ptr: *mut c_void) { unsafe { let _ = Box::from_raw(this_ptr as *mut nativeInvalidShutdownScript); } } #[allow(unused)] @@ -172,7 +172,7 @@ pub(crate) extern "C" fn ShutdownScript_write_void(obj: *const c_void) -> crate: #[no_mangle] /// Read a ShutdownScript from a byte array, created by ShutdownScript_write pub extern "C" fn ShutdownScript_read(ser: crate::c_types::u8slice) -> crate::c_types::derived::CResult_ShutdownScriptDecodeErrorZ { - let res = crate::c_types::deserialize_obj(ser); + let res: Result = crate::c_types::deserialize_obj(ser); let mut local_res = match res { Ok(mut o) => crate::c_types::CResultTempl::ok( { crate::lightning::ln::script::ShutdownScript { inner: ObjOps::heap_alloc(o), is_owned: true } }).into(), Err(mut e) => crate::c_types::CResultTempl::err( { crate::lightning::ln::msgs::DecodeError { inner: ObjOps::heap_alloc(e), is_owned: true } }).into() }; local_res }