From 0a87c0ced1837051f49b7646c0d635bc3cbe836b Mon Sep 17 00:00:00 2001
From: AntiochP <30642645+antiochp@users.noreply.github.com>
Date: Fri, 8 Dec 2017 12:12:10 -0500
Subject: [PATCH] body_sync every 5s, but request 10*most_work_peers blocks at
 a time (#448)

header_sync every 10s
---
 chain/src/chain.rs |  2 +-
 grin/src/sync.rs   | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/chain/src/chain.rs b/chain/src/chain.rs
index d76a93aac..081202d03 100644
--- a/chain/src/chain.rs
+++ b/chain/src/chain.rs
@@ -33,7 +33,7 @@ use sumtree;
 use types::*;
 use util::LOGGER;
 
-const MAX_ORPHANS: usize = 20;
+const MAX_ORPHANS: usize = 50;
 
 /// Facade to the blockchain block processing pipeline and storage. Provides
 /// the current view of the UTXO set according to the chain state. Also
diff --git a/grin/src/sync.rs b/grin/src/sync.rs
index 4dac6ad83..2d740273b 100644
--- a/grin/src/sync.rs
+++ b/grin/src/sync.rs
@@ -46,8 +46,8 @@ pub fn run_sync(
 				if a_inner.is_syncing() {
 					let current_time = time::now_utc();
 
-					// run the header sync every 5s
-					if current_time - prev_header_sync > time::Duration::seconds(5) {
+					// run the header sync every 10s
+					if current_time - prev_header_sync > time::Duration::seconds(10) {
 						header_sync(
 							p2p_server.clone(),
 							chain.clone(),
@@ -55,8 +55,8 @@ pub fn run_sync(
 						prev_header_sync = current_time;
 					}
 
-					// run the body_sync every iteration (1s)
-					if current_time - prev_body_sync > time::Duration::seconds(1) {
+					// run the body_sync every 5s
+					if current_time - prev_body_sync > time::Duration::seconds(5) {
 						body_sync(
 							p2p_inner.clone(),
 							c_inner.clone(),
@@ -64,9 +64,9 @@ pub fn run_sync(
 						prev_body_sync = current_time;
 					}
 
-					thread::sleep(Duration::from_millis(250));
+					thread::sleep(Duration::from_secs(1));
 				} else {
-					thread::sleep(Duration::from_secs(5));
+					thread::sleep(Duration::from_secs(10));
 				}
 			}
 		});
@@ -109,24 +109,28 @@ fn body_sync(
 	}
 	hashes.reverse();
 
+	// if we have 5 most_work_peers then ask for 50 blocks total (peer_count * 10)
+	// max will be 80 if all 8 peers are advertising most_work
 	let peer_count = {
 		p2p_server.most_work_peers().len()
 	};
+	let block_count = peer_count * 10;
 
 	let hashes_to_get = hashes
 		.iter()
 		.filter(|x| !chain.get_block(&x).is_ok())
-		.take(peer_count * 2)
+		.take(block_count)
 		.cloned()
 		.collect::<Vec<_>>();
 
 	if hashes_to_get.len() > 0 {
 		debug!(
 			LOGGER,
-			"block_sync: requesting blocks ({}/{}), {:?}",
+			"block_sync: {}/{} requesting blocks {:?} from {} peers",
 			body_head.height,
 			header_head.height,
 			hashes_to_get,
+			peer_count,
 			);
 
 		for hash in hashes_to_get.clone() {