38f497d refactor: use consistent parameter names in declarations and definitions:
Alternatively we could keep script rather than in in the script hash constructors, and keyid rather than address in CreateSig, updating the definitions instead (the base CreateSig declaration already uses keyid).
<details>
<summary>Keep descriptive script and key parameter names</summary>
diff --git a/src/addresstype.cpp b/src/addresstype.cpp
index b486951712..fca8bfa8bb 100644
--- a/src/addresstype.cpp
+++ b/src/addresstype.cpp
@@ -17,7 +17,7 @@
typedef std::vector<unsigned char> valtype;
-ScriptHash::ScriptHash(const CScript& in) : BaseHash(Hash160(in)) {}
+ScriptHash::ScriptHash(const CScript& script) : BaseHash(Hash160(script)) {}
PKHash::PKHash(const CPubKey& pubkey) : BaseHash(pubkey.GetID()) {}
PKHash::PKHash(const CKeyID& pubkey_id) : BaseHash(pubkey_id) {}
@@ -40,9 +40,9 @@ CScriptID ToScriptID(const ScriptHash& script_hash)
return CScriptID{uint160{script_hash}};
}
-WitnessV0ScriptHash::WitnessV0ScriptHash(const CScript& in)
+WitnessV0ScriptHash::WitnessV0ScriptHash(const CScript& script)
{
- CSHA256().Write(in.data(), in.size()).Finalize(begin());
+ CSHA256().Write(script.data(), script.size()).Finalize(begin());
}
bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
diff --git a/src/addresstype.h b/src/addresstype.h
index 7ed8a147a6..fc85ed0795 100644
--- a/src/addresstype.h
+++ b/src/addresstype.h
@@ -64,7 +64,7 @@ struct ScriptHash : public BaseHash<uint160>
explicit ScriptHash(const PKHash& hash) = delete;
explicit ScriptHash(const uint160& hash) : BaseHash(hash) {}
- explicit ScriptHash(const CScript& in);
+ explicit ScriptHash(const CScript& script);
};
CScriptID ToScriptID(const ScriptHash& script_hash);
@@ -72,7 +72,7 @@ struct WitnessV0ScriptHash : public BaseHash<uint256>
{
WitnessV0ScriptHash() : BaseHash() {}
explicit WitnessV0ScriptHash(const uint256& hash) : BaseHash(hash) {}
- explicit WitnessV0ScriptHash(const CScript& in);
+ explicit WitnessV0ScriptHash(const CScript& script);
};
struct WitnessV0KeyHash : public BaseHash<uint160>
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
index b6fc59c78d..c14f3aeeb2 100644
--- a/src/script/sign.cpp
+++ b/src/script/sign.cpp
@@ -51,12 +51,12 @@ MutableTransactionSignatureCreator::MutableTransactionSignatureCreator(const CMu
{
}
-bool MutableTransactionSignatureCreator::CreateSig(const SigningProvider& provider, std::vector<unsigned char>& vchSig, const CKeyID& address, const CScript& scriptCode, SigVersion sigversion) const
+bool MutableTransactionSignatureCreator::CreateSig(const SigningProvider& provider, std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode, SigVersion sigversion) const
{
assert(sigversion == SigVersion::BASE || sigversion == SigVersion::WITNESS_V0);
CKey key;
- if (!provider.GetKey(address, key))
+ if (!provider.GetKey(keyid, key))
return false;
// Signing with uncompressed keys is disabled in witness scripts
diff --git a/src/script/sign.h b/src/script/sign.h
index a931f67f89..107abb9e84 100644
--- a/src/script/sign.h
+++ b/src/script/sign.h
@@ -65,7 +65,7 @@ public:
MutableTransactionSignatureCreator(const CMutableTransaction& tx LIFETIMEBOUND, unsigned int input_idx, const CAmount& amount, const SignOptions& options);
MutableTransactionSignatureCreator(const CMutableTransaction& tx LIFETIMEBOUND, unsigned int input_idx, const CAmount& amount, const PrecomputedTransactionData* txdata, const SignOptions& options);
const BaseSignatureChecker& Checker() const override { return checker; }
- bool CreateSig(const SigningProvider& provider, std::vector<unsigned char>& vchSig, const CKeyID& address, const CScript& scriptCode, SigVersion sigversion) const override;
+ bool CreateSig(const SigningProvider& provider, std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode, SigVersion sigversion) const override;
bool CreateSchnorrSig(const SigningProvider& provider, std::vector<unsigned char>& sig, const XOnlyPubKey& pubkey, const uint256* leaf_hash, const uint256* merkle_root, SigVersion sigversion) const override;
std::vector<uint8_t> CreateMuSig2Nonce(const SigningProvider& provider, const CPubKey& aggregate_pubkey, const CPubKey& script_pubkey, const CPubKey& part_pubkey, const uint256* leaf_hash, const uint256* merkle_root, SigVersion sigversion, const SignatureData& sigdata) const override;
bool CreateMuSig2PartialSig(const SigningProvider& provider, uint256& partial_sig, const CPubKey& aggregate_pubkey, const CPubKey& script_pubkey, const CPubKey& part_pubkey, const uint256* leaf_hash, const std::vector<std::pair<uint256, bool>>& tweaks, SigVersion sigversion, const SignatureData& sigdata) const override;
</details>