From efd6c7a14322e3f30d2628a52c3f8308d0b4957a Mon Sep 17 00:00:00 2001
From: NikVolf <nikvolf@gmail.com>
Date: Tue, 15 Nov 2016 00:13:07 +0300
Subject: [PATCH] refactoring of opcounting

---
 verification/src/chain_verifier.rs | 10 +++++++---
 verification/src/queue.rs          |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/verification/src/chain_verifier.rs b/verification/src/chain_verifier.rs
index 079077d2..e802e8fb 100644
--- a/verification/src/chain_verifier.rs
+++ b/verification/src/chain_verifier.rs
@@ -134,7 +134,7 @@ impl ChainVerifier {
 			if self.skip_sig { continue; }
 
 			if let Err(e) = verify_script(&input, &output, &flags, &checker) {
-				println!("transaction signature verification failure: {:?}", e);
+				trace!(target: "verification", "transaction signature verification failure: {}", e);
 				// todo: log error here
 				return Err(TransactionError::Signature(input_index))
 			}
@@ -187,10 +187,14 @@ impl Verify for ChainVerifier {
 			}
 
 			try!(self.verify_transaction(block, transaction).map_err(|e| Error::Transaction(idx+1, e)));
-
 		}
 
-		trace!(target: "verification", "Block {} total sigops: {}", &hash, &block_sigops);
+		trace!(
+			target: "verification", "Block {} (transactons: {}, sigops: {}) verification finished",
+			&hash,
+			block.transactions().len(),
+			&block_sigops
+		);
 
 		// todo: pre-process projected block number once verification is parallel!
 		match self.store.accepted_location(block.header()) {
diff --git a/verification/src/queue.rs b/verification/src/queue.rs
index c0cac158..a8999acd 100644
--- a/verification/src/queue.rs
+++ b/verification/src/queue.rs
@@ -157,7 +157,7 @@ impl Queue {
 				items.push_front(hash, ScheduleItem::Continued(item.block(), num));
 			},
 			Err(e) => {
-				println!("Verification failed: {:?}", e);
+				trace!(target: "verification", "Verification of block {} failed: {:?}", &hash, e);
 				let mut invalid = self.invalid.write();
 				let mut processing = self.processing.write();