From: Gavin Andresen <gavinandresen@gmail.com>
Date: Thu, 29 Sep 2011 13:46:52 +0000 (-0400)
Subject: Collapse no-op ExtractAddress/ExtractAddressInner
X-Git-Tag: v0.4.0-unstable~129^2~306^2~11
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=7e55c1ab650163011a690daf74cb1cc89bdd563b

Collapse no-op ExtractAddress/ExtractAddressInner
---

diff --git a/src/script.cpp b/src/script.cpp
index 12d3f9e..4b2dc9a 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)
 {