mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-19 09:53:47 +01:00
Code Issues Projects Releases Wiki Activity

Use anonymous namespace instead of static functions

Browse Source
This commit is contained in:
Pieter Wuille 2018-04-19 21:06:47 -07:00
parent b61fb71136
commit 7d0f80bbf4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/script/ismine.cpp
View File

@ -13,6 +13,8 @@
typedef std::vector<unsigned char> valtype; typedef std::vector<unsigned char> valtype;
namespace {
/** /**
* This is an enum that tracks the execution context of a script, similar to * This is an enum that tracks the execution context of a script, similar to
* SigVersion in script/interpreter. It is separate however because we want to * SigVersion in script/interpreter. It is separate however because we want to
@ -26,12 +28,12 @@ enum class IsMineSigVersion
WITNESS_V0 = 2 //! P2WSH witness script execution WITNESS_V0 = 2 //! P2WSH witness script execution
}; };
static bool PermitsUncompressed(IsMineSigVersion sigversion) bool PermitsUncompressed(IsMineSigVersion sigversion)
{ {
return sigversion == IsMineSigVersion::TOP || sigversion == IsMineSigVersion::P2SH; return sigversion == IsMineSigVersion::TOP || sigversion == IsMineSigVersion::P2SH;
} }
static bool HaveKeys(const std::vector<valtype>& pubkeys, const CKeyStore& keystore) bool HaveKeys(const std::vector<valtype>& pubkeys, const CKeyStore& keystore)
{ {
for (const valtype& pubkey : pubkeys) { for (const valtype& pubkey : pubkeys) {
CKeyID keyID = CPubKey(pubkey).GetID(); CKeyID keyID = CPubKey(pubkey).GetID();
@ -40,7 +42,7 @@ static bool HaveKeys(const std::vector<valtype>& pubkeys, const CKeyStore& keyst
return true; return true;
} }
static isminetype IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey, bool& isInvalid, IsMineSigVersion sigversion) isminetype IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey, bool& isInvalid, IsMineSigVersion sigversion)
{ {
isInvalid = false; isInvalid = false;
@ -154,6 +156,8 @@ static isminetype IsMineInner(const CKeyStore& keystore, const CScript& scriptPu
return ISMINE_NO; return ISMINE_NO;
} }
} // namespace
isminetype IsMine(const CKeyStore& keystore, const CScript& scriptPubKey, bool& isInvalid) isminetype IsMine(const CKeyStore& keystore, const CScript& scriptPubKey, bool& isInvalid)
{ {
return IsMineInner(keystore, scriptPubKey, isInvalid, IsMineSigVersion::TOP); return IsMineInner(keystore, scriptPubKey, isInvalid, IsMineSigVersion::TOP);