diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-09-29 09:46:52 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-19 12:39:47 -0500 |
| commit | 7e55c1ab650163011a690daf74cb1cc89bdd563b (patch) | |
| tree | 497906b6cc9da65ca250e718c1c729f853b7ca1f /src/script.cpp | |
| parent | 99a289f531e9dc42aa81ea32ff84b807a46b6a9c (diff) | |
Collapse no-op ExtractAddress/ExtractAddressInner
Diffstat (limited to 'src/script.cpp')
| -rw-r--r-- | src/script.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/script.cpp b/src/script.cpp index 12d3f9e83a..4b2dc9a1a6 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -1117,7 +1117,7 @@ bool IsMine(const CKeyStore &keystore, const CScript& scriptPubKey) 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 static ExtractAddressInner(const CScript& scriptPubKey, const CKeyStore* ke } -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) { |