X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fmod.rs;h=95826b7e06ee73e0a02b3e1b36cf8ac6ef9ed12e;hb=28d33ff9e03b7e3a0cd7ba3bc59f1303b3903f88;hp=8c94ac5ca2230aac99083f0f7a2b01d900101116;hpb=edab29e8d834db2b2015b5aaff1c6ff3828ab048;p=rust-lightning

diff --git a/lightning/src/util/mod.rs b/lightning/src/util/mod.rs
index 8c94ac5c..95826b7e 100644
--- a/lightning/src/util/mod.rs
+++ b/lightning/src/util/mod.rs
@@ -1,32 +1,56 @@
+// 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(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;
 
-#[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;
 
-#[macro_use]
-pub(crate) mod fuzz_wrappers;