Mercurial > hg > bitcoin
changeset 1596:329f6d5cbeba draft
Collapse no-op ExtractAddress/ExtractAddressInner
author | Gavin Andresen <gavinandresen@gmail.com> |
---|---|
date | Thu, 29 Sep 2011 09:46:52 -0400 |
parents | c91f8fb533b3 |
children | 12cf0a8687a4 |
files | src/script.cpp |
diffstat | 1 files changed, 1 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/script.cpp +++ b/src/script.cpp @@ -1117,7 +1117,7 @@ return true; } -bool static ExtractAddressInner(const CScript& scriptPubKey, const CKeyStore* keystore, CBitcoinAddress& addressRet) +bool ExtractAddress(const CScript& scriptPubKey, const CKeyStore* keystore, CBitcoinAddress& addressRet) { vector<pair<opcodetype, valtype> > vSolution; if (!Solver(scriptPubKey, vSolution)) @@ -1137,15 +1137,6 @@ } -bool ExtractAddress(const CScript& scriptPubKey, const CKeyStore* keystore, CBitcoinAddress& addressRet) -{ - if (keystore) - return ExtractAddressInner(scriptPubKey, keystore, addressRet); - else - return ExtractAddressInner(scriptPubKey, NULL, addressRet); - return false; -} - bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const CTransaction& txTo, unsigned int nIn, int nHashType) {