X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Frouting%2Frouter.rs;h=dc094b9b6e0309a8fc51cd01a75a1ad480c3d432;hb=28d33ff9e03b7e3a0cd7ba3bc59f1303b3903f88;hp=2d7e1d202810c51596a5dbe7273d98e77f3d2e08;hpb=1af705579ba5b19ffcbd5ee95f8841cf5236e2b9;p=rust-lightning

diff --git a/lightning/src/routing/router.rs b/lightning/src/routing/router.rs
index 2d7e1d20..dc094b9b 100644
--- a/lightning/src/routing/router.rs
+++ b/lightning/src/routing/router.rs
@@ -12,7 +12,7 @@
 //! You probably want to create a NetGraphMsgHandler and use that as your RoutingMessageHandler and then
 //! interrogate it to get routes for your own payments.
 
-use bitcoin::secp256k1::key::PublicKey;
+use bitcoin::secp256k1::PublicKey;
 
 use ln::channelmanager::ChannelDetails;
 use ln::features::{ChannelFeatures, InvoiceFeatures, NodeFeatures};
@@ -1721,7 +1721,7 @@ mod tests {
 
 	use hex;
 
-	use bitcoin::secp256k1::key::{PublicKey,SecretKey};
+	use bitcoin::secp256k1::{PublicKey,SecretKey};
 	use bitcoin::secp256k1::{Secp256k1, All};
 
 	use prelude::*;
@@ -1780,10 +1780,10 @@ mod tests {
 
 		let msghash = hash_to_message!(&Sha256dHash::hash(&unsigned_announcement.encode()[..])[..]);
 		let valid_announcement = ChannelAnnouncement {
-			node_signature_1: secp_ctx.sign(&msghash, node_1_privkey),
-			node_signature_2: secp_ctx.sign(&msghash, node_2_privkey),
-			bitcoin_signature_1: secp_ctx.sign(&msghash, node_1_privkey),
-			bitcoin_signature_2: secp_ctx.sign(&msghash, node_2_privkey),
+			node_signature_1: secp_ctx.sign_ecdsa(&msghash, node_1_privkey),
+			node_signature_2: secp_ctx.sign_ecdsa(&msghash, node_2_privkey),
+			bitcoin_signature_1: secp_ctx.sign_ecdsa(&msghash, node_1_privkey),
+			bitcoin_signature_2: secp_ctx.sign_ecdsa(&msghash, node_2_privkey),
 			contents: unsigned_announcement.clone(),
 		};
 		match net_graph_msg_handler.handle_channel_announcement(&valid_announcement) {
@@ -1798,7 +1798,7 @@ mod tests {
 	) {
 		let msghash = hash_to_message!(&Sha256dHash::hash(&update.encode()[..])[..]);
 		let valid_channel_update = ChannelUpdate {
-			signature: secp_ctx.sign(&msghash, node_privkey),
+			signature: secp_ctx.sign_ecdsa(&msghash, node_privkey),
 			contents: update.clone()
 		};
 
@@ -1825,7 +1825,7 @@ mod tests {
 		};
 		let msghash = hash_to_message!(&Sha256dHash::hash(&unsigned_announcement.encode()[..])[..]);
 		let valid_announcement = NodeAnnouncement {
-			signature: secp_ctx.sign(&msghash, node_privkey),
+			signature: secp_ctx.sign_ecdsa(&msghash, node_privkey),
 			contents: unsigned_announcement.clone()
 		};
 
@@ -5352,8 +5352,9 @@ mod tests {
 				let payment_params = PaymentParameters::from_node_id(dst);
 				let amt = seed as u64 % 200_000_000;
 				let params = ProbabilisticScoringParameters::default();
-				let scorer = ProbabilisticScorer::new(params, &graph);
-				if get_route(src, &payment_params, &graph.read_only(), None, amt, 42, &test_utils::TestLogger::new(), &scorer, &random_seed_bytes).is_ok() {
+				let logger = test_utils::TestLogger::new();
+				let scorer = ProbabilisticScorer::new(params, &graph, &logger);
+				if get_route(src, &payment_params, &graph.read_only(), None, amt, 42, &logger, &scorer, &random_seed_bytes).is_ok() {
 					continue 'load_endpoints;
 				}
 			}
@@ -5388,8 +5389,9 @@ mod tests {
 				let payment_params = PaymentParameters::from_node_id(dst).with_features(InvoiceFeatures::known());
 				let amt = seed as u64 % 200_000_000;
 				let params = ProbabilisticScoringParameters::default();
-				let scorer = ProbabilisticScorer::new(params, &graph);
-				if get_route(src, &payment_params, &graph.read_only(), None, amt, 42, &test_utils::TestLogger::new(), &scorer, &random_seed_bytes).is_ok() {
+				let logger = test_utils::TestLogger::new();
+				let scorer = ProbabilisticScorer::new(params, &graph, &logger);
+				if get_route(src, &payment_params, &graph.read_only(), None, amt, 42, &logger, &scorer, &random_seed_bytes).is_ok() {
 					continue 'load_endpoints;
 				}
 			}
@@ -5435,6 +5437,7 @@ mod benches {
 	use ln::features::{InitFeatures, InvoiceFeatures};
 	use routing::scoring::{FixedPenaltyScorer, ProbabilisticScorer, ProbabilisticScoringParameters, Scorer};
 	use util::logger::{Logger, Record};
+	use util::test_utils::TestLogger;
 
 	use test::Bencher;
 
@@ -5519,17 +5522,19 @@ mod benches {
 
 	#[bench]
 	fn generate_routes_with_probabilistic_scorer(bench: &mut Bencher) {
+		let logger = TestLogger::new();
 		let network_graph = read_network_graph();
 		let params = ProbabilisticScoringParameters::default();
-		let scorer = ProbabilisticScorer::new(params, &network_graph);
+		let scorer = ProbabilisticScorer::new(params, &network_graph, &logger);
 		generate_routes(bench, &network_graph, scorer, InvoiceFeatures::empty());
 	}
 
 	#[bench]
 	fn generate_mpp_routes_with_probabilistic_scorer(bench: &mut Bencher) {
+		let logger = TestLogger::new();
 		let network_graph = read_network_graph();
 		let params = ProbabilisticScoringParameters::default();
-		let scorer = ProbabilisticScorer::new(params, &network_graph);
+		let scorer = ProbabilisticScorer::new(params, &network_graph, &logger);
 		generate_routes(bench, &network_graph, scorer, InvoiceFeatures::known());
 	}