Merge pull request #309 from TheBlueMatt/2019-02-306-nits

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

diff --git a/src/util/mod.rs b/src/util/mod.rs
index 2244f9b2fa44e1fb72c3fbf5c8feda1ce883dac0..e4170590d1003045deb0cd2567ff70e71aa461a9 100644 (file)
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -1,8 +1,13 @@
+//! 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 chacha20;
+#[cfg(not(feature = "fuzztarget"))]
+pub(crate) mod poly1305;
 pub(crate) mod chacha20poly1305rfc;
 pub(crate) mod internal_traits;
 pub(crate) mod rng;
@@ -13,16 +18,15 @@ pub(crate) mod ser_macros;
 #[macro_use]
 pub(crate) mod macro_logger;
 
-// Logger has to come after macro_logger for tests to build:
+// 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;
+pub use self::rng::{reset_rng_state, fill_bytes};
 
 #[cfg(test)]
 pub(crate) mod test_utils;
+
+#[macro_use]
+pub(crate) mod fuzz_wrappers;