Mercurial > hg > bitcoin

diff src/script.cpp @ 1596:329f6d5cbeba draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Collapse no-op ExtractAddress/ExtractAddressInner
author Gavin Andresen <gavinandresen@gmail.com>
date Thu, 29 Sep 2011 09:46:52 -0400
parents d8a2cdd23fdb
children 057a59e89d51
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)
 {