refactoring of opcounting
This commit is contained in:
parent
3ad579ea29
commit
efd6c7a143
|
@ -134,7 +134,7 @@ impl ChainVerifier {
|
||||||
if self.skip_sig { continue; }
|
if self.skip_sig { continue; }
|
||||||
|
|
||||||
if let Err(e) = verify_script(&input, &output, &flags, &checker) {
|
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
|
// todo: log error here
|
||||||
return Err(TransactionError::Signature(input_index))
|
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)));
|
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!
|
// todo: pre-process projected block number once verification is parallel!
|
||||||
match self.store.accepted_location(block.header()) {
|
match self.store.accepted_location(block.header()) {
|
||||||
|
|
|
@ -157,7 +157,7 @@ impl Queue {
|
||||||
items.push_front(hash, ScheduleItem::Continued(item.block(), num));
|
items.push_front(hash, ScheduleItem::Continued(item.block(), num));
|
||||||
},
|
},
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
println!("Verification failed: {:?}", e);
|
trace!(target: "verification", "Verification of block {} failed: {:?}", &hash, e);
|
||||||
let mut invalid = self.invalid.write();
|
let mut invalid = self.invalid.write();
|
||||||
let mut processing = self.processing.write();
|
let mut processing = self.processing.write();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue