X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fonion_route_tests.rs;h=706fcb6c24d2057857992758a4750ac36bb70499;hb=e49f738630559ce2eaa97689f1b4d37546fc7020;hp=414c98d4e85da80ee3f0ada988d5835f36ea8e13;hpb=219a4545bef056c9cb6d2947186719fdfcc8ec1b;p=rust-lightning

diff --git a/lightning/src/ln/onion_route_tests.rs b/lightning/src/ln/onion_route_tests.rs
index 414c98d4..706fcb6c 100644
--- a/lightning/src/ln/onion_route_tests.rs
+++ b/lightning/src/ln/onion_route_tests.rs
@@ -319,10 +319,10 @@ fn test_onion_failure() {
 	let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
 	let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[Some(config), Some(config), Some(node_2_cfg)]);
 	let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
+	let channels = [create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()), create_announced_chan_between_nodes(&nodes, 1, 2, InitFeatures::known(), InitFeatures::known())];
 	for node in nodes.iter() {
-		*node.keys_manager.override_session_priv.lock().unwrap() = Some([3; 32]);
+		*node.keys_manager.override_random_bytes.lock().unwrap() = Some([3; 32]);
 	}
-	let channels = [create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()), create_announced_chan_between_nodes(&nodes, 1, 2, InitFeatures::known(), InitFeatures::known())];
 	let (route, payment_hash, _, payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], 40000);
 	// positive case
 	send_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 40000);
@@ -610,10 +610,11 @@ macro_rules! get_phantom_route {
 					}
 		])]);
 		let scorer = test_utils::TestScorer::with_penalty(0);
+		let network_graph = $nodes[0].network_graph.read_only();
 		(get_route(
-			&$nodes[0].node.get_our_node_id(), &payment_params, $nodes[0].network_graph,
+			&$nodes[0].node.get_our_node_id(), &payment_params, &network_graph,
 			Some(&$nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
-			$amt, TEST_FINAL_CLTV, $nodes[0].logger, &scorer
+			$amt, TEST_FINAL_CLTV, $nodes[0].logger, &scorer, &[0u8; 32]
 		).unwrap(), phantom_route_hint.phantom_scid)
 	}
 }}
@@ -693,7 +694,7 @@ fn test_phantom_invalid_onion_payload() {
 
 	// We'll use the session priv later when constructing an invalid onion packet.
 	let session_priv = [3; 32];
-	*nodes[0].keys_manager.override_session_priv.lock().unwrap() = Some(session_priv);
+	*nodes[0].keys_manager.override_random_bytes.lock().unwrap() = Some(session_priv);
 	nodes[0].node.send_payment(&route, payment_hash.clone(), &Some(payment_secret)).unwrap();
 	check_added_monitors!(nodes[0], 1);
 	let update_0 = get_htlc_update_msgs!(nodes[0], nodes[1].node.get_our_node_id());
@@ -992,4 +993,3 @@ fn test_phantom_failure_reject_payment() {
 		.expected_htlc_error_data(0x4000 | 15, &error_data);
 	expect_payment_failed_conditions!(nodes[0], payment_hash, true, fail_conditions);
 }
-