X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=lightning%2Fsrc%2Fln%2Fmod.rs;h=3827cea84e0a3d983c8946bf9703fa5f9ff6826c;hb=021959f822222cd3782a212f0b7ad3819ee56349;hp=ecf40d75ec39de57238214514b01b2abf48f2e0d;hpb=50df4cf464261fbc6d808892cd43b7599c2274eb;p=rust-lightning

diff --git a/lightning/src/ln/mod.rs b/lightning/src/ln/mod.rs
index ecf40d75..3827cea8 100644
--- a/lightning/src/ln/mod.rs
+++ b/lightning/src/ln/mod.rs
@@ -1,3 +1,12 @@
+// This file is Copyright its original authors, visible in version control
+// history.
+//
+// This file is licensed under the Apache License, Version 2.0 <LICENSE-APACHE
+// or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option.
+// You may not use this file except in accordance with one or both of these
+// licenses.
+
 //! High level lightning structs and impls live here.
 //!
 //! You probably want to create a channelmanager::ChannelManager, and a routing::NetGraphMsgHandler first.
@@ -9,8 +18,11 @@
 //! you want to learn things about the network topology (eg get a route for sending a payment),
 //! call into your NetGraphMsgHandler.
 
+#[cfg(any(test, feature = "_test_utils"))]
+#[macro_use]
+pub mod functional_test_utils;
+
 pub mod channelmanager;
-pub mod channelmonitor;
 pub mod msgs;
 pub mod peer_handler;
 pub mod chan_utils;
@@ -26,14 +38,20 @@ mod channel;
 mod onion_utils;
 mod wire;
 
+// Older rustc (which we support) refuses to let us call the get_payment_preimage_hash!() macro
+// without the node parameter being mut. This is incorrect, and thus newer rustcs will complain
+// about an unnecessary mut. Thus, we silence the unused_mut warning in two test modules below.
+
 #[cfg(test)]
-#[macro_use]
-pub(crate) mod functional_test_utils;
-#[cfg(test)]
+#[allow(unused_mut)]
 mod functional_tests;
 #[cfg(test)]
+#[allow(unused_mut)]
 mod chanmon_update_fail_tests;
 #[cfg(test)]
 mod reorg_tests;
+#[cfg(test)]
+#[allow(unused_mut)]
+mod onion_route_tests;
 
 pub use self::peer_channel_encryptor::LN_MAX_MSG_LEN;