Put test utilities behind a feature flag.

The utilities will still be part of cfg(test). The purpose of this
is to enable other crates in the workspace to use the test utilities.

Author: valentinewallace

lightning/Cargo.toml

@@ -12,6 +12,7 @@ Still missing tons of error-handling. See GitHub issues for suggested projects i
 
 [features]
 fuzztarget = ["bitcoin/fuzztarget"]
+_test-utils = ["hex", "regex"]
 # Unlog messages superior at targeted level.
 max_level_off = []
 max_level_error = []
@@ -25,6 +26,9 @@ unsafe_revoked_tx_signing = []
 [dependencies]
 bitcoin = "0.23"
 
+hex = { version = "0.3", optional = true }
+regex = { version = "0.1.80", optional = true }
+
 [dev-dependencies.bitcoin]
 version = "0.23"
 features = ["bitcoinconsensus"]

lightning/src/chain/channelmonitor.rs

@@ -61,7 +61,7 @@ use std::io::Error;
 
 /// An update generated by the underlying Channel itself which contains some new information the
 /// ChannelMonitor should be made aware of.
-#[cfg_attr(test, derive(PartialEq))]
+#[cfg_attr(any(test, feature = "_test-utils"), derive(PartialEq))]
 #[derive(Clone)]
 #[must_use]
 pub struct ChannelMonitorUpdate {
@@ -635,7 +635,7 @@ enum OnchainEvent {
 const SERIALIZATION_VERSION: u8 = 1;
 const MIN_SERIALIZATION_VERSION: u8 = 1;
 
-#[cfg_attr(test, derive(PartialEq))]
+#[cfg_attr(any(test, feature = "_test-utils"), derive(PartialEq))]
 #[derive(Clone)]
 pub(crate) enum ChannelMonitorUpdateStep {
 	LatestLocalCommitmentTXInfo {
@@ -857,7 +857,7 @@ pub struct ChannelMonitor<ChanSigner: ChannelKeys> {
 	secp_ctx: Secp256k1<secp256k1::All>, //TODO: dedup this a bit...
 }
 
-#[cfg(any(test, feature = "fuzztarget"))]
+#[cfg(any(test, feature = "fuzztarget", feature = "_test-utils"))]
 /// Used only in testing and fuzztarget to check serialization roundtrips don't change the
 /// underlying object
 impl<ChanSigner: ChannelKeys> PartialEq for ChannelMonitor<ChanSigner> {

lightning/src/lib.rs

@@ -18,7 +18,7 @@
 //! generated/etc. This makes it a good candidate for tight integration into an existing wallet
 //! instead of having a rather-separate lightning appendage to a wallet.
 
-#![cfg_attr(not(feature = "fuzztarget"), deny(missing_docs))]
+#![cfg_attr(not(any(feature = "fuzztarget", feature = "_test-utils")), deny(missing_docs))]
 #![forbid(unsafe_code)]
 
 // In general, rust is absolutely horrid at supporting users doing things like,
@@ -28,8 +28,8 @@
 #![allow(ellipsis_inclusive_range_patterns)]
 
 extern crate bitcoin;
-#[cfg(test)] extern crate hex;
-#[cfg(test)] extern crate regex;
+#[cfg(any(test, feature = "_test-utils"))] extern crate hex;
+#[cfg(any(test, feature = "_test-utils"))] extern crate regex;
 
 #[macro_use]
 pub mod util;

lightning/src/ln/channelmanager.rs

@@ -403,9 +403,9 @@ pub struct ChannelManager<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref,
 	last_block_hash: Mutex<BlockHash>,
 	secp_ctx: Secp256k1<secp256k1::All>,
 
-	#[cfg(test)]
+	#[cfg(any(test, feature = "_test-utils"))]
 	pub(super) channel_state: Mutex<ChannelHolder<ChanSigner>>,
-	#[cfg(not(test))]
+	#[cfg(not(any(test, feature = "_test-utils")))]
 	channel_state: Mutex<ChannelHolder<ChanSigner>>,
 	our_network_key: SecretKey,
 

lightning/src/ln/functional_test_utils.rs

@@ -261,6 +261,7 @@ macro_rules! get_event_msg {
 	}
 }
 
+#[allow(unused_macros)]
 macro_rules! get_htlc_update_msgs {
 	($node: expr, $node_id: expr) => {
 		{
@@ -277,6 +278,7 @@ macro_rules! get_htlc_update_msgs {
 	}
 }
 
+#[allow(unused_macros)]
 macro_rules! get_feerate {
 	($node: expr, $channel_id: expr) => {
 		{
@@ -287,6 +289,7 @@ macro_rules! get_feerate {
 	}
 }
 
+#[allow(unused_macros)]
 macro_rules! get_local_commitment_txn {
 	($node: expr, $channel_id: expr) => {
 		{
@@ -325,6 +328,7 @@ macro_rules! unwrap_send_err {
 	}
 }
 
+#[macro_export]
 macro_rules! check_added_monitors {
 	($node: expr, $count: expr) => {
 		{
@@ -539,6 +543,7 @@ macro_rules! get_closing_signed_broadcast {
 	}
 }
 
+#[macro_export]
 macro_rules! check_closed_broadcast {
 	($node: expr, $with_error_msg: expr) => {{
 		let events = $node.node.get_and_clear_pending_msg_events();
@@ -765,6 +770,7 @@ macro_rules! expect_pending_htlcs_forwardable {
 	}}
 }
 
+#[allow(unused_macros)]
 macro_rules! expect_payment_received {
 	($node: expr, $expected_payment_hash: expr, $expected_recv_value: expr) => {
 		let events = $node.node.get_and_clear_pending_events();
@@ -793,6 +799,7 @@ macro_rules! expect_payment_sent {
 	}
 }
 
+#[allow(unused_macros)]
 macro_rules! expect_payment_failed {
 	($node: expr, $expected_payment_hash: expr, $rejected_by_dest: expr $(, $expected_error_code: expr, $expected_error_data: expr)*) => {
 		let events = $node.node.get_and_clear_pending_events();
@@ -1270,6 +1277,7 @@ pub fn get_announce_close_broadcast_events<'a, 'b, 'c>(nodes: &Vec<Node<'a, 'b,
 	}
 }
 
+#[allow(unused_macros)]
 macro_rules! get_channel_value_stat {
 	($node: expr, $channel_id: expr) => {{
 		let chan_lock = $node.node.channel_state.lock().unwrap();

lightning/src/ln/mod.rs

@@ -34,9 +34,9 @@ mod channel;
 mod onion_utils;
 mod wire;
 
-#[cfg(test)]
+#[cfg(any(test, feature = "_test-utils"))]
 #[macro_use]
-pub(crate) mod functional_test_utils;
+pub mod functional_test_utils;
 #[cfg(test)]
 mod functional_tests;
 #[cfg(test)]

lightning/src/util/mod.rs

@@ -32,10 +32,10 @@ pub(crate) mod macro_logger;
 pub mod logger;
 pub mod config;
 
-#[cfg(test)]
-pub(crate) mod test_utils;
+#[cfg(any(test, feature = "_test-utils"))]
+pub mod test_utils;
 
 /// impls of traits that add exra enforcement on the way they're called. Useful for detecting state
 /// machine errors and used in fuzz targets and tests.
-#[cfg(any(test, feature = "fuzztarget"))]
+#[cfg(any(test, feature = "fuzztarget", feature = "_test-utils"))]
 pub mod enforcing_trait_impls;