diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-01-21 13:15:19 +0100 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-01-21 13:52:32 +0100 |
commit | 52b29dca7670c3f6d2ab918c0fff1d17c4e494ad (patch) | |
tree | 81a173031fa09d54d36a07af87d68c32edb224cb /src/script | |
parent | da83ecd45478367e5388c58fe29a4a8d72f7f1cd (diff) | |
download | bitcoin-52b29dca7670c3f6d2ab918c0fff1d17c4e494ad.tar.xz |
Get rid of inaccurate ScriptSigArgsExpected
Diffstat (limited to 'src/script')
-rw-r--r-- | src/script/standard.cpp | 21 | ||||
-rw-r--r-- | src/script/standard.h | 1 |
2 files changed, 0 insertions, 22 deletions
diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 30935768ac..67b6af327a 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -161,27 +161,6 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi return false; } -int ScriptSigArgsExpected(txnouttype t, const std::vector<std::vector<unsigned char> >& vSolutions) -{ - switch (t) - { - case TX_NONSTANDARD: - case TX_NULL_DATA: - return -1; - case TX_PUBKEY: - return 1; - case TX_PUBKEYHASH: - return 2; - case TX_MULTISIG: - if (vSolutions.size() < 1 || vSolutions[0].size() < 1) - return -1; - return vSolutions[0][0] + 1; - case TX_SCRIPTHASH: - return 1; // doesn't include args needed by the script - } - return -1; -} - bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet) { vector<valtype> vSolutions; diff --git a/src/script/standard.h b/src/script/standard.h index 6bac6e4097..64bf010ec1 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -71,7 +71,6 @@ typedef boost::variant<CNoDestination, CKeyID, CScriptID> CTxDestination; const char* GetTxnOutputType(txnouttype t); bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<std::vector<unsigned char> >& vSolutionsRet); -int ScriptSigArgsExpected(txnouttype t, const std::vector<std::vector<unsigned char> >& vSolutions); bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet); bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<CTxDestination>& addressRet, int& nRequiredRet); |