Move get_channel_details helper into router::test_utils

Used incoming commit(s) to test onion message pathfinding

Author: valentinewallace

lightning/src/routing/router.rs

@@ -1937,8 +1937,7 @@ mod tests {
 		PaymentParameters, Route, RouteHint, RouteHintHop, RouteHop, RoutingFees,
 		DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, MAX_PATH_LENGTH_ESTIMATE};
 	use routing::scoring::{ChannelUsage, Score, ProbabilisticScorer, ProbabilisticScoringParameters};
-	use routing::test_utils::{add_channel, add_or_update_node, build_graph, build_line_graph, id_to_feature_flags, get_nodes, update_channel};
-	use chain::transaction::OutPoint;
+	use routing::test_utils::{add_channel, add_or_update_node, build_graph, build_line_graph, get_channel_details, id_to_feature_flags, get_nodes, update_channel};
 	use chain::keysinterface::KeysInterface;
 	use ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
 	use ln::msgs::{ErrorAction, LightningError, UnsignedChannelUpdate, MAX_VALUE_MSAT};
@@ -1948,7 +1947,6 @@ mod tests {
 	#[cfg(c_bindings)]
 	use util::ser::{Writeable, Writer};
 
-	use bitcoin::hashes::Hash;
 	use bitcoin::network::constants::Network;
 	use bitcoin::blockdata::constants::genesis_block;
 	use bitcoin::blockdata::script::Builder;
@@ -1965,40 +1963,6 @@ mod tests {
 
 	use core::convert::TryInto;
 
-	fn get_channel_details(short_channel_id: Option<u64>, node_id: PublicKey,
-			features: InitFeatures, outbound_capacity_msat: u64) -> channelmanager::ChannelDetails {
-		channelmanager::ChannelDetails {
-			channel_id: [0; 32],
-			counterparty: channelmanager::ChannelCounterparty {
-				features,
-				node_id,
-				unspendable_punishment_reserve: 0,
-				forwarding_info: None,
-				outbound_htlc_minimum_msat: None,
-				outbound_htlc_maximum_msat: None,
-			},
-			funding_txo: Some(OutPoint { txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0 }),
-			channel_type: None,
-			short_channel_id,
-			outbound_scid_alias: None,
-			inbound_scid_alias: None,
-			channel_value_satoshis: 0,
-			user_channel_id: 0,
-			balance_msat: 0,
-			outbound_capacity_msat,
-			next_outbound_htlc_limit_msat: outbound_capacity_msat,
-			inbound_capacity_msat: 42,
-			unspendable_punishment_reserve: None,
-			confirmations_required: None,
-			force_close_spend_delay: None,
-			is_outbound: true, is_channel_ready: true,
-			is_usable: true, is_public: true,
-			inbound_htlc_minimum_msat: None,
-			inbound_htlc_maximum_msat: None,
-			config: None,
-		}
-	}
-
 	#[test]
 	fn simple_route_test() {
 		let (secp_ctx, network_graph, _, _, logger) = build_graph();

lightning/src/routing/test_utils.rs

@@ -7,8 +7,10 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use chain::transaction::OutPoint;
 use routing::gossip::{NetworkGraph, P2PGossipSync};
-use ln::features::{ChannelFeatures, NodeFeatures};
+use ln::channelmanager;
+use ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
 use ln::msgs::{UnsignedChannelAnnouncement, ChannelAnnouncement, RoutingMessageHandler,
 	NodeAnnouncement, UnsignedNodeAnnouncement, ChannelUpdate, UnsignedChannelUpdate, MAX_VALUE_MSAT};
 use util::test_utils;
@@ -27,6 +29,40 @@ use bitcoin::secp256k1::{Secp256k1, All};
 use prelude::*;
 use sync::{self, Arc};
 
+pub(super) fn get_channel_details(short_channel_id: Option<u64>, node_id: PublicKey,
+	features: InitFeatures, outbound_capacity_msat: u64) -> channelmanager::ChannelDetails {
+	channelmanager::ChannelDetails {
+		channel_id: [0; 32],
+		counterparty: channelmanager::ChannelCounterparty {
+			features,
+			node_id,
+			unspendable_punishment_reserve: 0,
+			forwarding_info: None,
+			outbound_htlc_minimum_msat: None,
+			outbound_htlc_maximum_msat: None,
+		},
+		funding_txo: Some(OutPoint { txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0 }),
+		channel_type: None,
+		short_channel_id,
+		outbound_scid_alias: None,
+		inbound_scid_alias: None,
+		channel_value_satoshis: 0,
+		user_channel_id: 0,
+		balance_msat: 0,
+		outbound_capacity_msat,
+		next_outbound_htlc_limit_msat: outbound_capacity_msat,
+		inbound_capacity_msat: 42,
+		unspendable_punishment_reserve: None,
+		confirmations_required: None,
+		force_close_spend_delay: None,
+		is_outbound: true, is_channel_ready: true,
+		is_usable: true, is_public: true,
+		inbound_htlc_minimum_msat: None,
+		inbound_htlc_maximum_msat: None,
+		config: None,
+	}
+}
+
 // Using the same keys for LN and BTC ids
 pub(super) fn add_channel(
 	gossip_sync: &P2PGossipSync<Arc<NetworkGraph<Arc<test_utils::TestLogger>>>, Arc<test_utils::TestChainSource>, Arc<test_utils::TestLogger>>,