X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=lightning%2Fsrc%2Futil%2Ftest_utils.rs;fp=lightning%2Fsrc%2Futil%2Ftest_utils.rs;h=2892af41c62d11fad77229af2dd27ade4dd20d93;hb=0cc3572719966c61b6dd767fbfce95ac3efc9cb5;hp=7c7aeb5d44f03da527b549f6d816c0ae1a3fce3b;hpb=610511ced61d601b928368f633d33be2719b5be8;p=rust-lightning

diff --git a/lightning/src/util/test_utils.rs b/lightning/src/util/test_utils.rs
index 7c7aeb5d..2892af41 100644
--- a/lightning/src/util/test_utils.rs
+++ b/lightning/src/util/test_utils.rs
@@ -287,9 +287,9 @@ impl TestChannelMessageHandler {
 
 impl Drop for TestChannelMessageHandler {
 	fn drop(&mut self) {
-		let l = self.expected_recv_msgs.lock().unwrap();
 		#[cfg(feature = "std")]
 		{
+			let l = self.expected_recv_msgs.lock().unwrap();
 			if !std::thread::panicking() {
 				assert!(l.is_none() || l.as_ref().unwrap().is_empty());
 			}
@@ -470,14 +470,12 @@ impl msgs::RoutingMessageHandler for TestRoutingMessageHandler {
 			return ();
 		}
 
-		let should_request_full_sync = self.request_full_sync.load(Ordering::Acquire);
-
 		#[allow(unused_mut, unused_assignments)]
 		let mut gossip_start_time = 0;
 		#[cfg(feature = "std")]
 		{
 			gossip_start_time = SystemTime::now().duration_since(UNIX_EPOCH).expect("Time must be > 1970").as_secs();
-			if should_request_full_sync {
+			if self.request_full_sync.load(Ordering::Acquire) {
 				gossip_start_time -= 60 * 60 * 24 * 7 * 2; // 2 weeks ago
 			} else {
 				gossip_start_time -= 60 * 60; // an hour ago