From 885c2d73eacb4f11ea295b916de7d011b42b101f Mon Sep 17 00:00:00 2001
From: Simon B <simon.bohlin@gmail.com>
Date: Thu, 18 Jan 2018 23:47:42 +0100
Subject: [PATCH] Making initial sync easier on the eyes [master] (#623)

* Making initial sync easier on the eyes:
- display "chain pointers" as: cumulative @ height [hash]
- clarify and line up to make the "pointers" easy to compare
- make every 100th block show info on debug level info, else as before
---
 chain/src/pipe.rs    | 53 ++++++++++++++++++--------------------------
 grin/src/miner.rs    |  6 ++---
 p2p/src/handshake.rs |  9 +++++++-
 3 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/chain/src/pipe.rs b/chain/src/pipe.rs
index aaeb427fb..e19bcc194 100644
--- a/chain/src/pipe.rs
+++ b/chain/src/pipe.rs
@@ -175,12 +175,14 @@ fn validate_header(header: &BlockHeader, ctx: &mut BlockContext) -> Result<(), E
 	}
 
 	if !ctx.opts.intersects(SKIP_POW) {
-		let cycle_size = global::sizeshift();
-
-		debug!(LOGGER, "pipe: validate_header cuckoo size {}", cycle_size);
-		if !(ctx.pow_verifier)(header, cycle_size as u32) {
+		let n = global::sizeshift() as u32;
+		if !(ctx.pow_verifier)(header, n) {
+			error!(LOGGER, "pipe: validate_header failed for cuckoo shift size {}", n);
 			return Err(Error::InvalidPow);
 		}
+		if header.height % 500 == 0 {
+			debug!(LOGGER, "Validating header validated, using cuckoo shift size {}", n);
+		}
 	}
 
 	// first I/O cost, better as late as possible
@@ -333,16 +335,12 @@ fn update_head(b: &Block, ctx: &mut BlockContext) -> Result<Option<Tip>, Error>
 				.map_err(|e| Error::StoreErr(e, "pipe save head".to_owned()))?;
 		}
 		ctx.head = tip.clone();
-		debug!(
-			LOGGER,
-			"pipe: update_head: {}, {} at {}",
-			b.hash(),
-			b.header.total_difficulty,
-			b.header.height
-		);
-		if b.header.height % 500 == 0 {
+		if b.header.height % 100 == 0 {
 			info!(LOGGER, "pipe: chain head reached {} @ {} [{}]",
 				b.header.height, b.header.difficulty, b.hash());
+		} else {
+			debug!(LOGGER, "pipe: chain head reached {} @ {} [{}]",
+				b.header.height, b.header.difficulty, b.hash());
 		}
 		Ok(Some(tip))
 	} else {
@@ -357,15 +355,10 @@ fn update_sync_head(bh: &BlockHeader, ctx: &mut BlockContext) -> Result<Option<T
 		.save_sync_head(&tip)
 		.map_err(|e| Error::StoreErr(e, "pipe save sync head".to_owned()))?;
 	ctx.head = tip.clone();
-	debug!(
-		LOGGER,
-		"pipe: update_sync_head: {}, {} at {}",
-		bh.hash(),
-		bh.total_difficulty,
-		bh.height,
-	);
-	if bh.height % 1000 == 0 {
-		info!(LOGGER, "pipe: sync head reached {} [{}]", bh.height, bh.hash());
+	if bh.height % 100 == 0 {
+		info!(LOGGER, "sync head {} @ {} [{}]", bh.total_difficulty, bh.height, bh.hash());
+	} else {
+		debug!(LOGGER, "sync head {} @ {} [{}]", bh.total_difficulty, bh.height, bh.hash());
 	}
 	Ok(Some(tip))
 }
@@ -378,13 +371,11 @@ fn update_header_head(bh: &BlockHeader, ctx: &mut BlockContext) -> Result<Option
 			.save_header_head(&tip)
 			.map_err(|e| Error::StoreErr(e, "pipe save header head".to_owned()))?;
 		ctx.head = tip.clone();
-		debug!(
-			LOGGER,
-			"pipe: update_header_head: {}, {} at {}",
-			bh.hash(),
-			bh.total_difficulty,
-			bh.height,
-		);
+		if bh.height % 100 == 0 {
+			info!(LOGGER, "header head {} @ {} [{}]", bh.total_difficulty, bh.height, bh.hash());
+		} else {
+			debug!(LOGGER, "header head {} @ {} [{}]", bh.total_difficulty, bh.height, bh.hash());
+		}
 		Ok(Some(tip))
 	} else {
 		Ok(None)
@@ -420,10 +411,10 @@ pub fn rewind_and_apply_fork(
 
 	debug!(
 		LOGGER,
-		"validate_block: forked_block: {} at {}",
-		forked_block.header.hash(),
+		"rewind_and_apply_fork @ {} [{}]",
 		forked_block.header.height,
-		);
+		forked_block.header.hash(),
+	);
 
 	// rewind the sum trees up to the forking block
 	ext.rewind(&forked_block)?;
diff --git a/grin/src/miner.rs b/grin/src/miner.rs
index 4ff2bed35..6fe0cb84d 100644
--- a/grin/src/miner.rs
+++ b/grin/src/miner.rs
@@ -167,9 +167,9 @@ impl Miner {
 		);
 
 		// look for a pow for at most attempt_time_per_block sec on the
-  // same block (to give a chance to new
-  // transactions) and as long as the head hasn't changed
-  // Will change this to something else at some point
+		// same block (to give a chance to new
+		// transactions) and as long as the head hasn't changed
+		// Will change this to something else at some point
 		let deadline = time::get_time().sec + attempt_time_per_block as i64;
 
 		// how often to output stats
diff --git a/p2p/src/handshake.rs b/p2p/src/handshake.rs
index 19abd0e15..733b04924 100644
--- a/p2p/src/handshake.rs
+++ b/p2p/src/handshake.rs
@@ -106,7 +106,14 @@ impl Handshake {
 							total_difficulty: shake.total_difficulty,
 						};
 
-						debug!(LOGGER, "Connected to peer {:?}", peer_info);
+						debug!(
+							LOGGER,
+							"Connected! Cumulative {} offered from {:?} {:?} {:?}",
+							peer_info.total_difficulty.into_num(),
+							peer_info.addr,
+							peer_info.user_agent,
+							peer_info.capabilities
+						);
 						// when more than one protocol version is supported, choosing should go here
 						Ok((conn, ProtocolV1::new(), peer_info))
 					}