Merge #9912: Optimize GetWitnessHash() for non-segwit transactions

laanwj · laanwj · commit 6015df5b855f · 2017-03-07T11:03:32.000+01:00
02c57b5 Optimize GetWitnessHash() for non-segwit transactions (Suhas Daftuar) Tree-SHA512: 405d07c11930f3432ae25b11232466a30ba2339be98e0fb5149934d792e014f504fedbe62b9c8e5febbbdad459bd1573ea896e527b9aa591926bbc774b895e6a
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
@@ -69,6 +69,9 @@ uint256 CTransaction::ComputeHash() const
 
 uint256 CTransaction::GetWitnessHash() const
 {
+    if (!HasWitness()) {
+        return GetHash();
+    }
     return SerializeHash(*this, SER_GETHASH, 0);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,9 @@ uint256 CTransaction::ComputeHash() const`
`69`	`69`
`70`	`70`	`uint256 CTransaction::GetWitnessHash() const`
`71`	`71`	`{`
	`72`	`+ if (!HasWitness()) {`
	`73`	`+ return GetHash();`
	`74`	`+ }`
`72`	`75`	`return SerializeHash(*this, SER_GETHASH, 0);`
`73`	`76`	`}`
`74`	`77`