Move GetIndexKey into rpc/misc.cpp near getAddressesFromParams

No need to have it in base58.cpp anymore as this is only used in getAddressesFromParams

Author: codablock

src/base58.cpp

@@ -359,16 +359,3 @@ bool IsValidDestinationString(const std::string& str)
     return CBitcoinAddress(str).IsValid();
 }
 
-bool GetIndexKey(const std::string& str, uint160& hashBytes, int& type)
-{
-    CTxDestination dest = DecodeDestination(str);
-    if (!IsValidDestination(dest)) {
-        type = 0;
-        return false;
-    }
-    const CKeyID *keyID = boost::get<CKeyID>(&dest);
-    const CScriptID *scriptID = boost::get<CScriptID>(&dest);
-    type = keyID ? 1 : 2;
-    hashBytes = keyID ? *keyID : *scriptID;
-    return true;
-}

src/base58.h

@@ -148,6 +148,4 @@ CTxDestination DecodeDestination(const std::string& str);
 bool IsValidDestinationString(const std::string& str);
 bool IsValidDestinationString(const std::string& str, const CChainParams& params);
 
-bool GetIndexKey(const std::string& str, uint160& hashBytes, int& type);
-
 #endif // BITCOIN_BASE58_H

src/rpc/misc.cpp

@@ -665,12 +665,26 @@ bool getAddressFromIndex(const int &type, const uint160 &hash, std::string &addr
     return true;
 }
 
+bool getIndexKey(const std::string& str, uint160& hashBytes, int& type)
+{
+    CTxDestination dest = DecodeDestination(str);
+    if (!IsValidDestination(dest)) {
+        type = 0;
+        return false;
+    }
+    const CKeyID *keyID = boost::get<CKeyID>(&dest);
+    const CScriptID *scriptID = boost::get<CScriptID>(&dest);
+    type = keyID ? 1 : 2;
+    hashBytes = keyID ? *keyID : *scriptID;
+    return true;
+}
+
 bool getAddressesFromParams(const UniValue& params, std::vector<std::pair<uint160, int> > &addresses)
 {
     if (params[0].isStr()) {
         uint160 hashBytes;
         int type = 0;
-        if (!GetIndexKey(params[0].get_str(), hashBytes, type)) {
+        if (!getIndexKey(params[0].get_str(), hashBytes, type)) {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
         }
         addresses.push_back(std::make_pair(hashBytes, type));
@@ -687,7 +701,7 @@ bool getAddressesFromParams(const UniValue& params, std::vector<std::pair<uint16
 
             uint160 hashBytes;
             int type = 0;
-            if (!GetIndexKey(it->get_str(), hashBytes, type)) {
+            if (!getIndexKey(it->get_str(), hashBytes, type)) {
                 throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
             }
             addresses.push_back(std::make_pair(hashBytes, type));