Merge pull request #171 from TheBlueMatt/2018-09-ser-fixes

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

diff --git a/src/util/mod.rs b/src/util/mod.rs
index 008a9e1d7e1e0649b4fe07d92f1f2e142751adcc..308825855bd934f46e314477bb432cdda2fb7aa1 100644 (file)
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -1,14 +1,31 @@
 pub mod events;
+pub mod errors;
 
 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;
 
+#[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;
+
+#[cfg(feature = "fuzztarget")]
+#[macro_use]
+pub mod ser;
+#[cfg(not(feature = "fuzztarget"))]
+#[macro_use]
+pub(crate) mod ser;
+
+pub mod logger;