projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #185 from TheBlueMatt/2018-09-ser-rework
[rust-lightning]
/
src
/
util
/
mod.rs
diff --git
a/src/util/mod.rs
b/src/util/mod.rs
index 308825855bd934f46e314477bb432cdda2fb7aa1..2244f9b2fa44e1fb72c3fbf5c8feda1ce883dac0 100644
(file)
--- a/
src/util/mod.rs
+++ b/
src/util/mod.rs
@@
-1,5
+1,6
@@
pub mod events;
pub mod errors;
pub mod events;
pub mod errors;
+pub mod ser;
pub(crate) mod byte_utils;
pub(crate) mod chacha20poly1305rfc;
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;
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"))]
#[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;
#[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;