Merge pull request #219 from TheBlueMatt/2018-10-157-merge

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

diff --git a/src/util/mod.rs b/src/util/mod.rs
index 008a9e1d7e1e0649b4fe07d92f1f2e142751adcc..b91b4f25d96fa116ea92b473e0b69c313b178919 100644 (file)
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -1,12 +1,28 @@
+//! 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;
+
+// Logger has to come after macro_logger for tests to build:
+pub mod logger;
+
+#[cfg(feature = "fuzztarget")]
+pub mod sha2;
+#[cfg(not(feature = "fuzztarget"))]
+pub(crate) mod sha2;
+
 #[cfg(feature = "fuzztarget")]
 pub use self::rng::reset_rng_state;