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

diff --git a/lightning/src/util/mod.rs b/lightning/src/util/mod.rs
index 42c59b45..31bdf1ca 100644
--- a/lightning/src/util/mod.rs
+++ b/lightning/src/util/mod.rs
@@ -1,21 +1,42 @@
+// 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;
 
-pub mod events;
+#[macro_use]
+pub mod ser_macros;
+
 pub mod errors;
 pub mod ser;
+pub mod message_signing;
+pub mod invoice;
+pub mod persist;
+pub mod scid_utils;
+pub mod string;
+pub mod wakers;
+#[cfg(fuzzing)]
+pub mod base32;
+#[cfg(not(fuzzing))]
+pub(crate) mod base32;
 
+pub(crate) mod atomic_counter;
 pub(crate) mod byte_utils;
-pub(crate) mod chacha20;
-#[cfg(not(feature = "fuzztarget"))]
-pub(crate) mod poly1305;
-pub(crate) mod chacha20poly1305rfc;
 pub(crate) mod transaction_utils;
+pub(crate) mod time;
+pub mod hash_tables;
 
-#[macro_use]
-pub(crate) mod ser_macros;
+pub mod indexed_map;
+
+/// Logging macro utilities.
 #[macro_use]
 pub(crate) mod macro_logger;
 
@@ -23,10 +44,11 @@ pub(crate) mod macro_logger;
 pub mod logger;
 pub mod config;
 
-#[cfg(test)]
-pub(crate) mod test_utils;
+#[cfg(any(test, 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"))]
-pub mod enforcing_trait_impls;
+#[cfg(any(test, feature = "_test_utils"))]
+pub mod test_channel_signer;
+