Script interpreter nits

sipa · sipa · commit cdc57baa723e · 2020-09-23T13:38:28.000-07:00
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
@@ -1531,7 +1531,7 @@ bool SignatureHashSchnorr(uint256& hash_out, const ScriptExecutionData& execdata
         ss << execdata.m_annex_hash;
     }
 
-    // Data about the output(s)
+    // Data about the output (if only one).
     if (output_type == SIGHASH_SINGLE) {
         if (in_pos >= tx_to.vout.size()) return false;
         CHashWriter sha_single_output(SER_GETHASH, 0);
@@ -1675,7 +1675,7 @@ bool GenericTransactionSignatureChecker<T>::CheckSchnorrSignature(Span<const uns
         if (hashtype == SIGHASH_DEFAULT) return false;
     }
     uint256 sighash;
-    if (!SignatureHashSchnorr(sighash, execdata, *txTo, nIn, hashtype, sigversion, 0x00, this->txdata)) return false;
+    if (!SignatureHashSchnorr(sighash, execdata, *txTo, nIn, hashtype, sigversion, /* key_version */ 0x00, this->txdata)) return false;
     return VerifySchnorrSignature(sig, pubkey, sighash);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1531,7 +1531,7 @@ bool SignatureHashSchnorr(uint256& hash_out, const ScriptExecutionData& execdata`
`1531`	`1531`	`ss << execdata.m_annex_hash;`
`1532`	`1532`	`}`
`1533`	`1533`
`1534`		`- // Data about the output(s)`
	`1534`	`+ // Data about the output (if only one).`
`1535`	`1535`	`if (output_type == SIGHASH_SINGLE) {`
`1536`	`1536`	`if (in_pos >= tx_to.vout.size()) return false;`
`1537`	`1537`	`CHashWriter sha_single_output(SER_GETHASH, 0);`
`@@ -1675,7 +1675,7 @@ bool GenericTransactionSignatureChecker<T>::CheckSchnorrSignature(Span<const uns`
`1675`	`1675`	`if (hashtype == SIGHASH_DEFAULT) return false;`
`1676`	`1676`	`}`
`1677`	`1677`	`uint256 sighash;`
`1678`		`- if (!SignatureHashSchnorr(sighash, execdata, *txTo, nIn, hashtype, sigversion, 0x00, this->txdata)) return false;`
	`1678`	`+ if (!SignatureHashSchnorr(sighash, execdata, txTo, nIn, hashtype, sigversion, / key_version */ 0x00, this->txdata)) return false;`
`1679`	`1679`	`return VerifySchnorrSignature(sig, pubkey, sighash);`
`1680`	`1680`	`}`
`1681`	`1681`