Remove unused argument to WitnessSigOps(...)
This commit is contained in:
parent
d1d7cfebd2
commit
bd9d0690dc
1 changed files with 3 additions and 3 deletions
|
@ -1588,7 +1588,7 @@ bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const C
|
|||
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 (witprogram.size() == WITNESS_V0_KEYHASH_SIZE)
|
||||
|
@ -1616,7 +1616,7 @@ size_t CountWitnessSigOps(const CScript& scriptSig, const CScript& scriptPubKey,
|
|||
int witnessversion;
|
||||
std::vector<unsigned char> 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()) {
|
||||
|
@ -1628,7 +1628,7 @@ size_t CountWitnessSigOps(const CScript& scriptSig, const CScript& scriptPubKey,
|
|||
}
|
||||
CScript subscript(data.begin(), data.end());
|
||||
if (subscript.IsWitnessProgram(witnessversion, witnessprogram)) {
|
||||
return WitnessSigOps(witnessversion, witnessprogram, witness ? *witness : witnessEmpty, flags);
|
||||
return WitnessSigOps(witnessversion, witnessprogram, witness ? *witness : witnessEmpty);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue