Revert & honor request_full_sync.

Author: tnull

lightning/src/ln/peer_handler.rs

@@ -1867,6 +1867,8 @@ mod tests {
 	fn test_do_attempt_write_data() {
 		// Create 2 peers with custom TestRoutingMessageHandlers and connect them.
 		let cfgs = create_peermgr_cfgs(2);
+		cfgs[0].routing_handler.request_full_sync.store(true, Ordering::Release);
+		cfgs[1].routing_handler.request_full_sync.store(true, Ordering::Release);
 		let peers = create_network(2, &cfgs);
 
 		// By calling establish_connect, we trigger do_attempt_write_data between
@@ -1908,6 +1910,8 @@ mod tests {
 		// Tests that we time out a peer still waiting on handshake completion after a full timer
 		// tick.
 		let cfgs = create_peermgr_cfgs(2);
+		cfgs[0].routing_handler.request_full_sync.store(true, Ordering::Release);
+		cfgs[1].routing_handler.request_full_sync.store(true, Ordering::Release);
 		let peers = create_network(2, &cfgs);
 
 		let secp_ctx = Secp256k1::new();

lightning/src/util/test_utils.rs

@@ -44,11 +44,14 @@ use io;
 use prelude::*;
 use core::time::Duration;
 use sync::{Mutex, Arc};
-use core::sync::atomic::{AtomicUsize, Ordering};
+use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use core::{cmp, mem};
 use bitcoin::bech32::u5;
 use chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial};
 
+#[cfg(feature = "std")]
+use std::time::{SystemTime, UNIX_EPOCH};
+
 pub struct TestVecWriter(pub Vec<u8>);
 impl Writer for TestVecWriter {
 	fn write_all(&mut self, buf: &[u8]) -> Result<(), io::Error> {
@@ -342,6 +345,7 @@ pub struct TestRoutingMessageHandler {
 	pub chan_upds_recvd: AtomicUsize,
 	pub chan_anns_recvd: AtomicUsize,
 	pending_events: Mutex<Vec<events::MessageSendEvent>>,
+	pub request_full_sync: AtomicBool,
 }
 
 impl TestRoutingMessageHandler {
@@ -350,6 +354,7 @@ impl TestRoutingMessageHandler {
 			chan_upds_recvd: AtomicUsize::new(0),
 			chan_anns_recvd: AtomicUsize::new(0),
 			pending_events: Mutex::new(vec![]),
+			request_full_sync: AtomicBool::new(false),
 		}
 	}
 }
@@ -384,13 +389,31 @@ impl msgs::RoutingMessageHandler for TestRoutingMessageHandler {
 		Vec::new()
 	}
 
-	fn peer_connected(&self, their_node_id: &PublicKey, _init_msg: &msgs::Init) {
+	fn peer_connected(&self, their_node_id: &PublicKey, init_msg: &msgs::Init) {
+		if !init_msg.features.supports_gossip_queries() {
+			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 {
+				gossip_start_time -= 60 * 60 * 24 * 7 * 2; // 2 weeks ago
+			} else {
+				gossip_start_time -= 60 * 60; // an hour ago
+			}
+		}
+
 		let mut pending_events = self.pending_events.lock().unwrap();
 		pending_events.push(events::MessageSendEvent::SendGossipTimestampFilter {
 			node_id: their_node_id.clone(),
 			msg: msgs::GossipTimestampFilter {
 				chain_hash: genesis_block(Network::Testnet).header.block_hash(),
-				first_timestamp: 0,
+				first_timestamp: gossip_start_time as u32,
 				timestamp_range: u32::max_value(),
 			},
 		});