Fix several compile warnings when testing in no-std mode

Author: TheBlueMatt

lightning/src/routing/gossip.rs

@@ -421,13 +421,12 @@ where C::Target: chain::Access, L::Target: Logger
 		// `gossip_timestamp_filter`, with the filter time set either two weeks ago or an hour ago.
 		//
 		// For no-std builds, we bury our head in the sand and do a full sync on each connection.
-		let should_request_full_sync = self.should_request_full_sync(&their_node_id);
 		#[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.should_request_full_sync(&their_node_id) {
 				gossip_start_time -= 60 * 60 * 24 * 7 * 2; // 2 weeks ago
 			} else {
 				gossip_start_time -= 60 * 60; // an hour ago
@@ -1862,7 +1861,7 @@ mod tests {
 	use ln::PaymentHash;
 	use ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
 	use routing::gossip::{P2PGossipSync, NetworkGraph, NetworkUpdate, NodeAlias, MAX_EXCESS_BYTES_FOR_RELAY, NodeId, RoutingFees, ChannelUpdateInfo, ChannelInfo, NodeAnnouncementInfo, NodeInfo};
-	use ln::msgs::{Init, RoutingMessageHandler, UnsignedNodeAnnouncement, NodeAnnouncement,
+	use ln::msgs::{RoutingMessageHandler, UnsignedNodeAnnouncement, NodeAnnouncement,
 		UnsignedChannelAnnouncement, ChannelAnnouncement, UnsignedChannelUpdate, ChannelUpdate,
 		ReplyChannelRange, QueryChannelRange, QueryShortChannelIds, MAX_VALUE_MSAT};
 	use util::test_utils;
@@ -2593,6 +2592,7 @@ mod tests {
 	#[cfg(feature = "std")]
 	fn calling_sync_routing_table() {
 		use std::time::{SystemTime, UNIX_EPOCH};
+		use ln::msgs::Init;
 
 		let network_graph = create_network_graph();
 		let (secp_ctx, gossip_sync) = create_gossip_sync(&network_graph);

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