From: Matt Corallo <git@bluematt.me>
Date: Sun, 28 Jun 2020 17:19:40 +0000 (-0400)
Subject: Fix silent merge conflict between bcd65bed7bd9a and 940d7ac8d897589
X-Git-Tag: v0.0.12~52^2~1
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=94c37c6c0e6825974120bf694524844f2bc07985;p=rust-lightning

Fix silent merge conflict between bcd65bed7bd9a and 940d7ac8d897589
---

diff --git a/lightning/src/ln/functional_tests.rs b/lightning/src/ln/functional_tests.rs
index 73629750d..0200ece21 100644
--- a/lightning/src/ln/functional_tests.rs
+++ b/lightning/src/ln/functional_tests.rs
@@ -1566,7 +1566,7 @@ fn test_fee_spike_violation_fails_htlc() {
 	macro_rules! get_route_and_payment_hash {
 		($recv_value: expr) => {{
 			let (payment_preimage, payment_hash) = get_payment_preimage_hash!(nodes[1]);
-			let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
+			let net_graph_msg_handler = &nodes[0].net_graph_msg_handler.network_graph.read().unwrap();
 			let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes.last().unwrap().node.get_our_node_id(), None, &Vec::new(), $recv_value, TEST_FINAL_CLTV, &logger).unwrap();
 			(route, payment_hash, payment_preimage)
 		}}