X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Futil%2Fmod.rs;h=2244f9b2fa44e1fb72c3fbf5c8feda1ce883dac0;hb=e0fad3f8a36ccdd9add2a327041d28ddf2ccaecf;hp=308825855bd934f46e314477bb432cdda2fb7aa1;hpb=1b8504a3f3f46736abb886121718bde07321f2b2;p=rust-lightning diff --git a/src/util/mod.rs b/src/util/mod.rs index 30882585..2244f9b2 100644 --- a/src/util/mod.rs +++ b/src/util/mod.rs @@ -1,5 +1,6 @@ pub mod events; pub mod errors; +pub mod ser; pub(crate) mod byte_utils; pub(crate) mod chacha20poly1305rfc; @@ -7,6 +8,14 @@ pub(crate) mod internal_traits; pub(crate) mod rng; 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"))] @@ -17,15 +26,3 @@ 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;