X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=lightning-c-bindings%2Fsrc%2Flightning%2Futil%2Fmod.rs;h=a8163b6946b24618e080bf718ec0155dc689e8a9;hb=c1c9f6e11f25f39b39bebabfc2b8478d62c896ef;hp=2a1eb6024fb0d1f7c818cbdebe23470af6bb7bdd;hpb=709706e247c4210ce80f54b597b4e5d5607f3fed;p=ldk-c-bindings

diff --git a/lightning-c-bindings/src/lightning/util/mod.rs b/lightning-c-bindings/src/lightning/util/mod.rs
index 2a1eb60..a8163b6 100644
--- a/lightning-c-bindings/src/lightning/util/mod.rs
+++ b/lightning-c-bindings/src/lightning/util/mod.rs
@@ -9,6 +9,7 @@
 //! Some utility modules live here. See individual sub-modules for more info.
 
 use alloc::str::FromStr;
+use alloc::string::String;
 use core::ffi::c_void;
 use core::convert::Infallible;
 use bitcoin::hashes::Hash;
@@ -16,18 +17,21 @@ use crate::c_types::*;
 #[cfg(feature="no-std")]
 use alloc::{vec::Vec, boxed::Box};
 
-pub mod events;
+pub mod ser_macros;
 pub mod errors;
 pub mod ser;
 pub mod message_signing;
 pub mod invoice;
 pub mod persist;
+pub mod string;
 pub mod wakers;
+pub mod indexed_map;
 pub mod logger;
 pub mod config;
 mod fuzz_wrappers {
 
 use alloc::str::FromStr;
+use alloc::string::String;
 use core::ffi::c_void;
 use core::convert::Infallible;
 use bitcoin::hashes::Hash;
@@ -36,9 +40,10 @@ use crate::c_types::*;
 use alloc::{vec::Vec, boxed::Box};
 
 }
-mod ser_macros {
+mod base32 {
 
 use alloc::str::FromStr;
+use alloc::string::String;
 use core::ffi::c_void;
 use core::convert::Infallible;
 use bitcoin::hashes::Hash;
@@ -50,6 +55,7 @@ use alloc::{vec::Vec, boxed::Box};
 mod atomic_counter {
 
 use alloc::str::FromStr;
+use alloc::string::String;
 use core::ffi::c_void;
 use core::convert::Infallible;
 use bitcoin::hashes::Hash;
@@ -61,6 +67,7 @@ use alloc::{vec::Vec, boxed::Box};
 mod byte_utils {
 
 use alloc::str::FromStr;
+use alloc::string::String;
 use core::ffi::c_void;
 use core::convert::Infallible;
 use bitcoin::hashes::Hash;
@@ -72,6 +79,7 @@ use alloc::{vec::Vec, boxed::Box};
 mod chacha20 {
 
 use alloc::str::FromStr;
+use alloc::string::String;
 use core::ffi::c_void;
 use core::convert::Infallible;
 use bitcoin::hashes::Hash;
@@ -82,6 +90,7 @@ use alloc::{vec::Vec, boxed::Box};
 mod real_chacha {
 
 use alloc::str::FromStr;
+use alloc::string::String;
 use core::ffi::c_void;
 use core::convert::Infallible;
 use bitcoin::hashes::Hash;
@@ -90,32 +99,11 @@ use crate::c_types::*;
 use alloc::{vec::Vec, boxed::Box};
 
 }
-}
-mod fairrwlock {
-
-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};
-
-}
-mod zbase32 {
-
-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};
-
 }
 mod poly1305 {
 
 use alloc::str::FromStr;
+use alloc::string::String;
 use core::ffi::c_void;
 use core::convert::Infallible;
 use bitcoin::hashes::Hash;
@@ -127,6 +115,7 @@ use alloc::{vec::Vec, boxed::Box};
 mod chacha20poly1305rfc {
 
 use alloc::str::FromStr;
+use alloc::string::String;
 use core::ffi::c_void;
 use core::convert::Infallible;
 use bitcoin::hashes::Hash;
@@ -137,6 +126,7 @@ use alloc::{vec::Vec, boxed::Box};
 mod real_chachapoly {
 
 use alloc::str::FromStr;
+use alloc::string::String;
 use core::ffi::c_void;
 use core::convert::Infallible;
 use bitcoin::hashes::Hash;
@@ -149,6 +139,7 @@ use alloc::{vec::Vec, boxed::Box};
 mod transaction_utils {
 
 use alloc::str::FromStr;
+use alloc::string::String;
 use core::ffi::c_void;
 use core::convert::Infallible;
 use bitcoin::hashes::Hash;
@@ -160,6 +151,7 @@ use alloc::{vec::Vec, boxed::Box};
 mod scid_utils {
 
 use alloc::str::FromStr;
+use alloc::string::String;
 use core::ffi::c_void;
 use core::convert::Infallible;
 use bitcoin::hashes::Hash;
@@ -170,6 +162,7 @@ use alloc::{vec::Vec, boxed::Box};
 mod fake_scid {
 
 use alloc::str::FromStr;
+use alloc::string::String;
 use core::ffi::c_void;
 use core::convert::Infallible;
 use bitcoin::hashes::Hash;
@@ -182,6 +175,7 @@ use alloc::{vec::Vec, boxed::Box};
 mod time {
 
 use alloc::str::FromStr;
+use alloc::string::String;
 use core::ffi::c_void;
 use core::convert::Infallible;
 use bitcoin::hashes::Hash;
@@ -193,6 +187,7 @@ use alloc::{vec::Vec, boxed::Box};
 mod macro_logger {
 
 use alloc::str::FromStr;
+use alloc::string::String;
 use core::ffi::c_void;
 use core::convert::Infallible;
 use bitcoin::hashes::Hash;
@@ -204,6 +199,7 @@ use alloc::{vec::Vec, boxed::Box};
 mod crypto {
 
 use alloc::str::FromStr;
+use alloc::string::String;
 use core::ffi::c_void;
 use core::convert::Infallible;
 use bitcoin::hashes::Hash;