f expose

Author: devrandom

lightning/src/ln/functional_test_utils.rs

@@ -28,11 +28,9 @@ use crate::routing::gossip::{P2PGossipSync, NetworkGraph, NetworkUpdate};
 use crate::routing::router::{self, PaymentParameters, Route, RouteParameters};
 use crate::sign::{EntropySource, RandomBytes};
 use crate::util::config::{MaxDustHTLCExposure, UserConfig};
-#[cfg(any(test, feature = "_test_utils"))]
 use crate::util::logger::Logger;
 use crate::util::scid_utils;
 use crate::util::test_channel_signer::TestChannelSigner;
-#[cfg(any(test, feature = "_test_utils"))]
 use crate::util::test_channel_signer::SignerOp;
 use crate::util::test_utils;
 use crate::util::test_utils::{TestChainMonitor, TestScorer, TestKeysInterface};
@@ -515,8 +513,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 	/// Toggles this node's signer to be available for the given signer operation.
 	/// This is useful for testing behavior for restoring an async signer that previously
 	/// could not return a signature immediately.
-	#[cfg(any(test, feature = "_test_utils"))]
-	pub fn enable_channel_signer_op(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp) {
+		pub fn enable_channel_signer_op(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp) {
 		self.set_channel_signer_ops(peer_id, chan_id, signer_op, true);
 	}
 
@@ -535,8 +532,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 	/// will behave normally, returning `Ok`. When set to `false`, and the channel signer will
 	/// act like an off-line remote signer, returning `Err`. This applies to the signer in all
 	/// relevant places, i.e. the channel manager, chain monitor, and the keys manager.
-	#[cfg(any(test, feature = "_test_utils"))]
-	fn set_channel_signer_ops(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp, available: bool) {
+		fn set_channel_signer_ops(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp, available: bool) {
 		use crate::sign::ChannelSigner;
 		log_debug!(self.logger, "Setting channel signer for {} as available={}", chan_id, available);
 
@@ -1002,7 +998,6 @@ pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &mut
 	}
 }
 
-#[cfg(any(test, feature = "_externalize_tests"))]
 macro_rules! get_channel_ref {
 	($node: expr, $counterparty_node: expr, $per_peer_state_lock: ident, $peer_state_lock: ident, $channel_id: expr) => {
 		{
@@ -1013,7 +1008,6 @@ macro_rules! get_channel_ref {
 	}
 }
 
-#[cfg(any(test, feature = "_externalize_tests"))]
 macro_rules! get_feerate {
 	($node: expr, $counterparty_node: expr, $channel_id: expr) => {
 		{
@@ -1025,7 +1019,6 @@ macro_rules! get_feerate {
 	}
 }
 
-#[cfg(any(test, feature = "_externalize_tests"))]
 macro_rules! get_channel_type_features {
 	($node: expr, $counterparty_node: expr, $channel_id: expr) => {
 		{
@@ -1172,7 +1165,6 @@ pub fn _reload_node<'a, 'b, 'c>(node: &'a Node<'a, 'b, 'c>, default_config: User
 	node_deserialized
 }
 
-#[cfg(any(test, feature = "_externalize_tests"))]
 macro_rules! reload_node {
 	($node: expr, $new_config: expr, $chanman_encoded: expr, $monitors_encoded: expr, $persister: ident, $new_chain_monitor: ident, $new_channelmanager: ident) => {
 		let chanman_encoded = $chanman_encoded;
@@ -2011,7 +2003,6 @@ macro_rules! expect_pending_htlcs_forwardable_and_htlc_handling_failed {
 	}}
 }
 
-#[cfg(any(test, feature = "_externalize_tests"))]
 macro_rules! expect_pending_htlcs_forwardable_from_events {
 	($node: expr, $events: expr, $ignore: expr) => {{
 		assert_eq!($events.len(), 1);
@@ -2209,7 +2200,6 @@ macro_rules! get_route {
 	}}
 }
 
-#[cfg(any(test, feature = "_test_utils"))]
 #[macro_export]
 macro_rules! get_route_and_payment_hash {
 	($send_node: expr, $recv_node: expr, $recv_value: expr) => {{
@@ -2345,7 +2335,6 @@ macro_rules! expect_payment_sent {
 	}
 }
 
-#[cfg(any(test, feature = "_test_utils"))]
 #[macro_export]
 macro_rules! expect_payment_path_successful {
 	($node: expr) => {
@@ -2433,7 +2422,6 @@ macro_rules! expect_payment_forwarded {
 	}
 }
 
-#[cfg(any(test, feature = "_test_utils"))]
 #[macro_export]
 macro_rules! expect_channel_shutdown_state {
 	($node: expr, $chan_id: expr, $state: path) => {
@@ -2468,7 +2456,6 @@ pub fn expect_channel_ready_event<'a, 'b, 'c, 'd>(node: &'a Node<'b, 'c, 'd>, ex
 	}
 }
 
-#[cfg(any(test, feature = "_test_utils"))]
 pub fn expect_probe_successful_events(node: &Node, mut probe_results: Vec<(PaymentHash, PaymentId)>) {
 	let mut events = node.node.get_and_clear_pending_events();
 
@@ -2528,7 +2515,6 @@ impl<'a> PaymentFailedConditions<'a> {
 	}
 }
 
-#[cfg(any(test, feature = "_externalize_tests"))]
 macro_rules! expect_payment_failed_with_update {
 	($node: expr, $expected_payment_hash: expr, $payment_failed_permanently: expr, $scid: expr, $chan_closed: expr) => {
 		$crate::ln::functional_test_utils::expect_payment_failed_conditions(
@@ -2538,7 +2524,6 @@ macro_rules! expect_payment_failed_with_update {
 	}
 }
 
-#[cfg(any(test, feature = "_externalize_tests"))]
 macro_rules! expect_payment_failed {
 	($node: expr, $expected_payment_hash: expr, $payment_failed_permanently: expr $(, $expected_error_code: expr, $expected_error_data: expr)*) => {
 		#[allow(unused_mut)]
@@ -2557,14 +2542,11 @@ pub fn expect_payment_failed_conditions_event<'a, 'b, 'c, 'd, 'e>(
 	if conditions.expected_mpp_parts_remain { assert_eq!(payment_failed_events.len(), 1); } else { assert_eq!(payment_failed_events.len(), 2); }
 	let expected_payment_id = match &payment_failed_events[0] {
 		Event::PaymentPathFailed { payment_hash, payment_failed_permanently, payment_id, failure,
-			#[cfg(any(test, feature = "_test_utils"))]
-			error_code,
-			#[cfg(any(test, feature = "_test_utils"))]
-			error_data, .. } => {
+						error_code,
+						error_data, .. } => {
 			assert_eq!(*payment_hash, expected_payment_hash, "unexpected payment_hash");
 			assert_eq!(*payment_failed_permanently, expected_payment_failed_permanently, "unexpected payment_failed_permanently value");
-			#[cfg(any(test, feature = "_test_utils"))]
-			{
+						{
 				assert!(error_code.is_some(), "expected error_code.is_some() = true");
 				assert!(error_data.is_some(), "expected error_data.is_some() = true");
 				if let Some((code, data)) = conditions.expected_htlc_error_data {
@@ -3627,7 +3609,6 @@ pub fn get_announce_close_broadcast_events<'a, 'b, 'c>(nodes: &Vec<Node<'a, 'b,
 	handle_announce_close_broadcast_events(nodes, a, b, false, "Channel closed because commitment or closing transaction was confirmed on chain.");
 }
 
-#[cfg(any(test, feature = "_externalize_tests"))]
 macro_rules! get_channel_value_stat {
 	($node: expr, $counterparty_node: expr, $channel_id: expr) => {{
 		let peer_state_lock = $node.node.per_peer_state.read().unwrap();

lightning/src/ln/functional_tests.rs

@@ -2267,7 +2267,6 @@ pub fn channel_reserve_in_flight_removes() {
 	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_3);
 }
 
-#[cfg(any(test, feature = "_test_utils"))]
 enum PostFailBackAction {
 	TimeoutOnChain,
 	ClaimOnChain,
@@ -2283,7 +2282,6 @@ fn test_fail_back_before_backwards_timeout() {
 	do_test_fail_back_before_backwards_timeout(PostFailBackAction::ClaimOffChain);
 }
 
-#[cfg(any(test, feature = "_test_utils"))]
 fn do_test_fail_back_before_backwards_timeout(post_fail_back_action: PostFailBackAction) {
 	// Test that we fail an HTLC upstream if we are still waiting for confirmation downstream
 	// just before the upstream timeout expires

lightning/src/routing/router.rs

@@ -198,7 +198,6 @@ pub(crate) struct FixedRouter {
 
 #[cfg(any(test, feature = "_test_utils"))]
 impl FixedRouter {
-	#[cfg(any(test, feature = "_test_utils"))]
 	pub(crate) fn new(route: Route) -> Self {
 		Self { route: Mutex::new(Some(route)) }
 	}