[Fluid] Remove unused methods in fluid class

AmirAbrams · AmirAbrams · commit 7d1bb408dba4 · 2019-05-22T01:08:14.000-05:00
diff --git a/src/fluid/fluid.cpp b/src/fluid/fluid.cpp
@@ -96,34 +96,6 @@ std::vector<std::string> InitialiseAddresses()
     return params.InitialiseAddresses();
 }
 
-/** Checks if any given address is a current master key (invoked by RPC) */
-bool CFluid::IsGivenKeyMaster(const CDynamicAddress& inputKey)
-{
-    if (!inputKey.IsValid()) {
-        return false;
-    }
-
-    std::vector<std::string> fluidSovereigns;
-    GetLastBlockIndex(chainActive.Tip());
-    CBlockIndex* pindex = chainActive.Tip();
-
-    if (pindex != NULL) {
-        //TODO fluid
-        fluidSovereigns = InitialiseAddresses(); //pindex->fluidParams.fluidSovereigns;
-    }
-
-    else
-        fluidSovereigns = InitialiseAddresses();
-
-    for (const std::string& strAddress : fluidSovereigns) {
-        CDynamicAddress attemptKey(strAddress);
-        if (attemptKey.IsValid() && inputKey == attemptKey)
-            return true;
-    }
-
-    return false;
-}
-
 std::vector<std::string> CFluidParameters::InitialiseAddresses()
 {
     std::vector<std::string> initialSovereignAddresses;
@@ -518,7 +490,7 @@ bool CFluid::ParseMintKey(const int64_t& nTime, CDynamicAddress& destination, CA
     return true;
 }
 
-static bool GetFluidBlock(const CBlockIndex* pblockindex, CBlock& block)
+bool GetFluidBlock(const CBlockIndex* pblockindex, CBlock& block)
 {
     if (pblockindex != nullptr) {
         // Check for invalid block position and file.
@@ -554,56 +526,6 @@ bool CFluid::GetMintingInstructions(const CBlockIndex* pblockindex, CDynamicAddr
     return false;
 }
 
-bool CFluid::GetProofOverrideRequest(const CBlockIndex* pblockindex, CAmount& coinAmount)
-{
-    CBlock block;
-    if (GetFluidBlock(pblockindex, block)) {
-        for (const CTransactionRef& tx : block.vtx) {
-            for (const CTxOut& txout : tx->vout) {
-                if (txout.scriptPubKey.IsProtocolInstruction(MINING_MODIFY_TX)) {
-                    std::string message;
-                    if (CheckIfQuorumExists(ScriptToAsmStr(txout.scriptPubKey), message))
-                        return GenericParseNumber(ScriptToAsmStr(txout.scriptPubKey), block.nTime, coinAmount);
-                }
-            }
-        }
-    }
-    return false;
-}
-
-bool CFluid::GetDynodeOverrideRequest(const CBlockIndex* pblockindex, CAmount& coinAmount)
-{
-    CBlock block;
-    if (GetFluidBlock(pblockindex, block)) {
-        for (const CTransactionRef& tx : block.vtx) {
-            for (const CTxOut& txout : tx->vout) {
-                if (txout.scriptPubKey.IsProtocolInstruction(DYNODE_MODFIY_TX)) {
-                    std::string message;
-                    if (CheckIfQuorumExists(ScriptToAsmStr(txout.scriptPubKey), message))
-                        return GenericParseNumber(ScriptToAsmStr(txout.scriptPubKey), block.nTime, coinAmount);
-                }
-            }
-        }
-    }
-    return false;
-}
-
-void CFluid::AddFluidTransactionsToRecord(const CBlockIndex* pblockindex, std::vector<std::string>& transactionRecord)
-{
-    CBlock block;
-    if (GetFluidBlock(pblockindex, block)) {
-        for (const CTransactionRef& tx : block.vtx) {
-            for (const CTxOut& txout : tx->vout) {
-                if (IsTransactionFluid(txout.scriptPubKey)) {
-                    if (!InsertTransactionToRecord(txout.scriptPubKey, transactionRecord)) {
-                        LogPrintf("AddFluidTransactionsToRecord(): Script Database Entry: %s , FAILED!\n", ScriptToAsmStr(txout.scriptPubKey));
-                    }
-                }
-            }
-        }
-    }
-}
-
 /* Check if transaction exists in record */
 bool CFluid::CheckTransactionInRecord(const CScript& fluidInstruction, CBlockIndex* pindex)
 {
@@ -627,29 +549,6 @@ bool CFluid::CheckTransactionInRecord(const CScript& fluidInstruction, CBlockInd
     return false;
 }
 
-/* Insertion of transaction script to record */
-bool CFluid::InsertTransactionToRecord(const CScript& fluidInstruction, std::vector<std::string>& transactionRecord)
-{
-    std::string verificationString;
-
-    if (IsTransactionFluid(fluidInstruction)) {
-        verificationString = ScriptToAsmStr(fluidInstruction);
-
-        std::string message;
-        if (CheckIfQuorumExists(verificationString, message)) {
-            for (const std::string& existingRecord : transactionRecord) {
-                if (existingRecord == verificationString) {
-                    return false;
-                }
-            }
-            transactionRecord.push_back(verificationString);
-            return true;
-        }
-    }
-
-    return false;
-}
-
 CAmount GetStandardPoWBlockPayment(const int nHeight)
 {
     if (nHeight == 1) {
diff --git a/src/fluid/fluid.h b/src/fluid/fluid.h
@@ -46,11 +46,8 @@ std::vector<std::string> InitialiseAddresses();
 class CFluid : public CFluidParameters, public COperations
 {
 public:
-    void AddFluidTransactionsToRecord(const CBlockIndex* pblockindex, std::vector<std::string>& transactionRecord);
     void ReplaceFluidSovereigns(const CBlockHeader& blockHeader, std::vector<std::string>& fluidSovereigns);
 
-    bool IsGivenKeyMaster(const CDynamicAddress& inputKey);
-
     bool CheckFluidOperationScript(const CScript& fluidScriptPubKey, const int64_t& timeStamp, std::string& errorMessage, const bool fSkipTimeStampCheck = false);
     bool CheckIfExistsInMemPool(const CTxMemPool& pool, const CScript& fluidScriptPubKey, std::string& errorMessage);
     bool CheckIfQuorumExists(const std::string& consentToken, std::string& message, const bool individual = false);
@@ -66,16 +63,12 @@ class CFluid : public CFluidParameters, public COperations
     bool ProcessFluidToken(const std::string& consentToken, std::vector<std::string>& ptrs, const int& strVecNo);
 
     bool GetMintingInstructions(const CBlockIndex* pblockindex, CDynamicAddress& toMintAddress, CAmount& mintAmount);
-    bool GetProofOverrideRequest(const CBlockIndex* pblockindex, CAmount& howMuch);
-    bool GetDynodeOverrideRequest(const CBlockIndex* pblockindex, CAmount& howMuch);
-
     bool ValidationProcesses(CValidationState& state, const CScript& txOut, const CAmount& txValue);
 
     bool CheckTransactionToBlock(const CTransaction& transaction, const CBlockHeader& blockHeader);
     bool CheckTransactionToBlock(const CTransaction& transaction, const uint256 hash);
 
     bool ProvisionalCheckTransaction(const CTransaction& transaction);
-    bool InsertTransactionToRecord(const CScript& fluidInstruction, std::vector<std::string>& transactionRecord);
     CDynamicAddress GetAddressFromDigestSignature(const std::string& digestSignature, const std::string& messageTokenKey);
     bool CheckAccountBanScript(const CScript& fluidScript, const uint256& txHashId, const unsigned int& nHeight, std::string& strErrorMessage);
 
@@ -93,6 +86,7 @@ int GetFluidOpCode(const CScript& fluidScript);
 std::vector<unsigned char> CharVectorFromString(const std::string& str);
 std::string StringFromCharVector(const std::vector<unsigned char>& vch);
 std::vector<unsigned char> FluidScriptToCharVector(const CScript& fluidScript);
+bool GetFluidBlock(const CBlockIndex* pblockindex, CBlock& block);
 
 extern CFluid fluid;
 
