mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused argument to WitnessSigOps(...)

Browse Source
This commit is contained in:
practicalswift committed 2018-07-10 18:12:57 +02:00
1 parent d1d7cfebd2
commit bd9d0690dc
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/script/interpreter.cpp
+3 -3
View File
@@ -1588,7 +1588,7 @@ bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const C
return set_success(serror); return set_success(serror);
} }
size_t static WitnessSigOps(int witversion, const std::vector<unsigned char>& witprogram, const CScriptWitness& witness, int flags) size_t static WitnessSigOps(int witversion, const std::vector<unsigned char>& witprogram, const CScriptWitness& witness)
{ {
if (witversion == 0) { if (witversion == 0) {
if (witprogram.size() == WITNESS_V0_KEYHASH_SIZE) if (witprogram.size() == WITNESS_V0_KEYHASH_SIZE)
@@ -1616,7 +1616,7 @@ size_t CountWitnessSigOps(const CScript& scriptSig, const CScript& scriptPubKey,
int witnessversion; int witnessversion;
std::vector<unsigned char> witnessprogram; std::vector<unsigned char> witnessprogram;
if (scriptPubKey.IsWitnessProgram(witnessversion, witnessprogram)) { if (scriptPubKey.IsWitnessProgram(witnessversion, witnessprogram)) {
return WitnessSigOps(witnessversion, witnessprogram, witness ? *witness : witnessEmpty, flags); return WitnessSigOps(witnessversion, witnessprogram, witness ? *witness : witnessEmpty);
} }
if (scriptPubKey.IsPayToScriptHash() && scriptSig.IsPushOnly()) { if (scriptPubKey.IsPayToScriptHash() && scriptSig.IsPushOnly()) {
@@ -1628,7 +1628,7 @@ size_t CountWitnessSigOps(const CScript& scriptSig, const CScript& scriptPubKey,
} }
CScript subscript(data.begin(), data.end()); CScript subscript(data.begin(), data.end());
if (subscript.IsWitnessProgram(witnessversion, witnessprogram)) { if (subscript.IsWitnessProgram(witnessversion, witnessprogram)) {
return WitnessSigOps(witnessversion, witnessprogram, witness ? *witness : witnessEmpty, flags); return WitnessSigOps(witnessversion, witnessprogram, witness ? *witness : witnessEmpty);
} }
} }