From 092533d09d5c6bd655b1f04e11a8767ea54870b5 Mon Sep 17 00:00:00 2001
From: Wesley Shillingford <wezrule@hotmail.com>
Date: Thu, 16 May 2019 10:30:08 +0100
Subject: [PATCH] Remove unnecessary debug_validate_ledger CLI option (#1974)

---
 nano/nano_node/entry.cpp | 74 ++++------------------------------------
 1 file changed, 7 insertions(+), 67 deletions(-)

diff --git a/nano/nano_node/entry.cpp b/nano/nano_node/entry.cpp
index 62fc0a28..6799005c 100644
--- a/nano/nano_node/entry.cpp
+++ b/nano/nano_node/entry.cpp
@@ -90,7 +90,6 @@ int main (int argc, char * const * argv)
 		("debug_opencl", "OpenCL work generation")
 		("debug_profile_verify", "Profile work verification")
 		("debug_profile_kdf", "Profile kdf function")
-		("debug_validate_ledger", "Does various checks on the ledger to make sure it is valid")
 		("debug_verify_profile", "Profile signature verification")
 		("debug_verify_profile_batch", "Profile batch signature verification")
 		("debug_profile_bootstrap", "Profile bootstrap style blocks processing (at least 10GB of free storage space required)")
@@ -767,7 +766,7 @@ int main (int argc, char * const * argv)
 		{
 			nano::inactive_node node (data_path);
 			auto transaction (node.node->store.tx_begin_read ());
-			std::cerr << boost::str (boost::format ("Performing blocks hash, signature, work validation...\n"));
+			std::cout << boost::str (boost::format ("Performing blocks hash, signature, work validation...\n"));
 			size_t count (0);
 			for (auto i (node.node->store.latest_begin (transaction)), n (node.node->store.latest_end ()); i != n; ++i)
 			{
@@ -778,6 +777,12 @@ int main (int argc, char * const * argv)
 				}
 				nano::account_info info (i->second);
 				nano::account account (i->first);
+
+				if (info.confirmation_height > info.block_count)
+				{
+					std::cerr << "Confirmation height " << info.confirmation_height << " greater than block count " << info.block_count << " for account: " << account.to_account () << std::endl;
+				}
+
 				auto hash (info.open_block);
 				nano::block_hash calculated_hash (0);
 				nano::block_sideband sideband;
@@ -998,71 +1003,6 @@ int main (int argc, char * const * argv)
 			}
 			std::cout << "Total cemented block count: " << sum << std::endl;
 		}
-		else if (vm.count ("debug_validate_ledger"))
-		{
-			// This checks some issues (can be extended):
-			// 1 - Compares account block count with head sideband height
-			// 2 - Deserialization works for all blocks (might just cause a crash)
-			// 3 - Confirmation height is not greater than account block count
-			// 4 - Account head is not a zero hash
-			std::cout << "Validating ledger, this can take a long time... " << std::endl;
-
-			nano::inactive_node node (data_path);
-			auto transaction (node.node->store.tx_begin_read ());
-			for (auto i (node.node->store.latest_begin (transaction)), n (node.node->store.latest_end ()); i != n && result == 0; ++i)
-			{
-				auto const & account = i->first;
-				auto const & account_info = i->second;
-
-				auto account_height = account_info.block_count;
-				if (account_height == 0)
-				{
-					std::cerr << "Invalid block height for " << account.to_account () << std::endl;
-					result = -1;
-					break;
-				}
-
-				if (account_info.confirmation_height > account_info.block_count)
-				{
-					std::cerr << "Confirmation height " << account_info.confirmation_height << " greater than block count " << account_info.block_count << " for account: " << account.to_account () << std::endl;
-					result = -1;
-					break;
-				}
-
-				auto head_hash = account_info.head;
-				if (head_hash.is_zero ())
-				{
-					std::cerr << "Invalid frontier block for " << account.to_account () << std::endl;
-					result = -1;
-					break;
-				}
-
-				nano::block_sideband sideband;
-				auto block = node.node->store.block_get (transaction, head_hash, &sideband);
-				if (sideband.height != account_height)
-				{
-					std::cerr << "Sideband height for head block " << sideband.height << " does not match account block count " << account_height << " for account  " << account.to_account () << std::endl;
-					result = -1;
-					break;
-				}
-
-				// Loop over all blocks in account chain to make sure they can be processed
-				auto hash = head_hash;
-				while (!hash.is_zero ())
-				{
-					block = node.node->store.block_get (transaction, hash);
-
-					if (!block)
-					{
-						std::cerr << "Could not get block hash " << hash.to_string () << std::endl;
-						result = -1;
-						break;
-					}
-					hash = block->previous ();
-				}
-			}
-			std::cout << "No errors detected" << std::endl;
-		}
 		else if (vm.count ("version"))
 		{
 			if (NANO_VERSION_PATCH == 0)