X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fmod.rs;h=c6181ab269a57a19a8d5ee8c9f225358d6695947;hb=f99301dd8a7f056c0ed09ec827fddc00f325b3e5;hp=42c59b4536bbf9164f088e88257a702969e8270c;hpb=8fb50f27280ec60f2271598327d36463ef9070ea;p=rust-lightning

diff --git a/lightning/src/util/mod.rs b/lightning/src/util/mod.rs
index 42c59b45..c6181ab2 100644
--- a/lightning/src/util/mod.rs
+++ b/lightning/src/util/mod.rs
@@ -1,32 +1,59 @@
+// This file is Copyright its original authors, visible in version control
+// history.
+//
+// This file is licensed under the Apache License, Version 2.0 <LICENSE-APACHE
+// or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option.
+// You may not use this file except in accordance with one or both of these
+// licenses.
+
 //! Some utility modules live here. See individual sub-modules for more info.
 
 #[macro_use]
 pub(crate) mod fuzz_wrappers;
 
+#[macro_use]
+pub(crate) mod ser_macros;
+
 pub mod events;
 pub mod errors;
 pub mod ser;
+pub mod message_signing;
+pub mod invoice;
+pub mod persist;
 
+pub(crate) mod atomic_counter;
 pub(crate) mod byte_utils;
 pub(crate) mod chacha20;
-#[cfg(not(feature = "fuzztarget"))]
+#[cfg(all(not(test), feature = "std"))]
+pub(crate) mod fairrwlock;
+#[cfg(fuzzing)]
+pub mod zbase32;
+#[cfg(not(fuzzing))]
+pub(crate) mod zbase32;
+#[cfg(not(fuzzing))]
 pub(crate) mod poly1305;
 pub(crate) mod chacha20poly1305rfc;
 pub(crate) mod transaction_utils;
+pub(crate) mod scid_utils;
+pub(crate) mod time;
 
-#[macro_use]
-pub(crate) mod ser_macros;
+/// Logging macro utilities.
 #[macro_use]
 pub(crate) mod macro_logger;
 
+/// Cryptography utilities.
+pub(crate) mod crypto;
+
 // These have to come after macro_logger to build
 pub mod logger;
 pub mod config;
 
-#[cfg(test)]
-pub(crate) mod test_utils;
+#[cfg(any(test, fuzzing, feature = "_test_utils"))]
+pub mod test_utils;
 
 /// impls of traits that add exra enforcement on the way they're called. Useful for detecting state
 /// machine errors and used in fuzz targets and tests.
-#[cfg(any(test, feature = "fuzztarget"))]
+#[cfg(any(test, fuzzing, feature = "_test_utils"))]
 pub mod enforcing_trait_impls;
+