Remove duplicate functions from rebase

Fuzzbawls · Fuzzbawls · commit 484118973528 · 2019-03-22T17:16:47.000-07:00
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp
@@ -3761,44 +3761,6 @@ UniValue spendrawzerocoin(const UniValue& params, bool fHelp)
     return DoZpivSpend(nAmount, false, true, 42, vMintsSelected, address_str);
 }
 
-
-UniValue clearspendcache(const UniValue& params, bool fHelp)
-{
-    if(fHelp || params.size() != 0)
-        throw runtime_error(
-            "clearspendcache\n"
-            "\nClear the pre-computed zPIV spend cache, and database.\n" +
-            HelpRequiringPassphrase() + "\n"
-
-            "\nExamples\n" +
-            HelpExampleCli("clearspendcache", "") + HelpExampleRpc("clearspendcache", ""));
-
-    EnsureWalletIsUnlocked();
-
-    CzPIVTracker* zpivTracker = pwalletMain->zpivTracker.get();
-
-    {
-        int nTries = 0;
-        while (nTries < 100) {
-            TRY_LOCK(zpivTracker->cs_spendcache, fLocked);
-            if (fLocked) {
-                if (zpivTracker->ClearSpendCache()) {
-                    fClearSpendCache = true;
-                    CWalletDB walletdb("precomputes.dat", "cr+");
-                    walletdb.EraseAllPrecomputes();
-                    return "Successfully Cleared the Precompute Spend Cache and Database";
-                }
-            } else {
-                fGlobalUnlockSpendCache = true;
-                nTries++;
-                MilliSleep(100);
-            }
-        }
-    }
-    throw JSONRPCError(RPC_WALLET_ERROR, "Error: Spend cache not cleared!");
-}
-
-
 UniValue clearspendcache(const UniValue& params, bool fHelp)
 {
     if(fHelp || params.size() != 0)
diff --git a/src/zpiv/accumulators.cpp b/src/zpiv/accumulators.cpp
@@ -798,25 +798,6 @@ bool CalculateAccumulatorWitnessFor(
     }
 }
 
-
-int SearchMintHeightOf(CBigNum value){
-    uint256 txid;
-    if (!zerocoinDB->ReadCoinMint(value, txid))
-        throw searchMintHeightException("searchForMintHeightOf:: failed to read mint from db");
-
-    CTransaction txMinted;
-    uint256 hashBlock;
-    if (!GetTransaction(txid, txMinted, hashBlock))
-        throw searchMintHeightException("searchForMintHeightOf:: failed to read tx");
-
-    int nHeightTest;
-    if (!IsTransactionInChain(txid, nHeightTest))
-        throw searchMintHeightException("searchForMintHeightOf:: mint tx "+ txid.GetHex() +" is not in chain");
-
-    return mapBlockIndex[hashBlock]->nHeight;
-}
-
-
 bool GenerateAccumulatorWitness(
         const PublicCoin &coin,
         Accumulator& accumulator,
