Add key_storage selection in ChannelMonitor insert_combine

[rust-lightning] / src / util / mod.rs

diff --git a/src/util/mod.rs b/src/util/mod.rs
index 766557e3ca52805379e4b5618243ac4f06ed2a76..842fbea605baba0f89e88d880f305a209c81a068 100644 (file)
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -1,19 +1,31 @@
+//! Some utility modules live here. See individual sub-modules for more info.
+
 pub mod events;
+pub mod errors;
+pub mod ser;
 
 pub(crate) mod byte_utils;
 pub(crate) mod chacha20poly1305rfc;
 pub(crate) mod internal_traits;
 pub(crate) mod rng;
-pub(crate) mod sha2;
 pub(crate) mod transaction_utils;
 
+#[macro_use]
+pub(crate) mod ser_macros;
+#[macro_use]
+pub(crate) mod macro_logger;
+
+// These have to come after macro_logger to build
+pub mod logger;
+pub mod config;
+
+#[cfg(feature = "fuzztarget")]
+pub mod sha2;
+#[cfg(not(feature = "fuzztarget"))]
+pub(crate) mod sha2;
+
 #[cfg(feature = "fuzztarget")]
 pub use self::rng::reset_rng_state;
 
 #[cfg(test)]
 pub(crate) mod test_utils;
-
-#[macro_use]
-pub(crate) mod macro_logger;
-
-pub mod logger;