rename: BlockSignatureCreator -> SimpleSignatureCreator

Author: kallewoof

src/pow.cpp

@@ -78,7 +78,7 @@ bool CheckProofOfWork(const uint256& hash, unsigned int nBits, const Consensus::
 {
     if (g_solution_blocks) {
         if (hash == params.hashGenesisBlock) return true;
-        BlockSignatureChecker bsc(hash);
+        SimpleSignatureChecker bsc(hash);
         const auto& payload = g_blockheader_payload_map.at(hash);
         CScript solution = CScript(payload.begin(), payload.end());
         CScript challenge = CScript(params.blockscript.begin(), params.blockscript.end());

src/script/interpreter.cpp

@@ -1416,7 +1416,7 @@ bool GenericTransactionSignatureChecker<T>::CheckSequence(const CScriptNum& nSeq
 template class GenericTransactionSignatureChecker<CTransaction>;
 template class GenericTransactionSignatureChecker<CMutableTransaction>;
 
-bool BlockSignatureChecker::CheckSig(const std::vector<unsigned char>& vchSigIn, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode, SigVersion sigversion) const
+bool SimpleSignatureChecker::CheckSig(const std::vector<unsigned char>& vchSigIn, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode, SigVersion sigversion) const
 {
     CPubKey pubkey(vchPubKey);
     if (!pubkey.IsValid())

src/script/interpreter.h

@@ -162,14 +162,14 @@ class BaseSignatureChecker
     virtual ~BaseSignatureChecker() {}
 };
 
-class BlockSignatureChecker : public BaseSignatureChecker
+class SimpleSignatureChecker : public BaseSignatureChecker
 {
 private:
     uint256 hash;
 
 public:
     const uint256& GetHash() const { return hash; }
-    BlockSignatureChecker(const uint256& hash_in) : hash(hash_in) {}
+    SimpleSignatureChecker(const uint256& hash_in) : hash(hash_in) {}
     bool CheckSig(const std::vector<unsigned char>& scriptSig, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode, SigVersion sigversion) const override;
 };
 

src/script/sign.cpp

@@ -32,7 +32,7 @@ bool MutableTransactionSignatureCreator::CreateSig(const SigningProvider& provid
     return true;
 }
 
-bool BlockSignatureCreator::CreateSig(const SigningProvider& provider, std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode, SigVersion sigversion) const
+bool SimpleSignatureCreator::CreateSig(const SigningProvider& provider, std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode, SigVersion sigversion) const
 {
     CKey key;
     if (!provider.GetKey(keyid, key)) return false;

src/script/sign.h

@@ -66,12 +66,12 @@ class BaseSignatureCreator {
     virtual bool CreateSig(const SigningProvider& provider, std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode, SigVersion sigversion) const =0;
 };
 
-class BlockSignatureCreator : public BaseSignatureCreator
+class SimpleSignatureCreator : public BaseSignatureCreator
 {
-    BlockSignatureChecker checker;
+    SimpleSignatureChecker checker;
 
 public:
-    BlockSignatureCreator(const uint256& hashIn) : BaseSignatureCreator(), checker(hashIn) {};
+    SimpleSignatureCreator(const uint256& hashIn) : BaseSignatureCreator(), checker(hashIn) {};
     const BaseSignatureChecker& Checker() const override { return checker; }
     bool CreateSig(const SigningProvider& provider, std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode, SigVersion sigversion) const override;
 };

src/wallet/rpcwallet.cpp

@@ -3896,7 +3896,7 @@ void SignBlockHashWithWallet(const uint256& hash, CWallet* const pwallet)
     size_t overhead = GetSizeOfCompactSize(siglen);
     for (size_t i = 0; i < 1000; ++i) {
         SignatureData solution(solution_in);
-        res = ProduceSignature(*pwallet, BlockSignatureCreator(hash), blockscript, solution);
+        res = ProduceSignature(*pwallet, SimpleSignatureCreator(hash), blockscript, solution);
         if (!res) {
             throw JSONRPCError(RPC_VERIFY_ERROR, "could not produce a signature -- do you have the private key(s)?");
         }