RPC, mnbudgetrawvote: use ProcessProposalVote instead of AddAndRelayP…

…roposalVote. And remove the now unused AddAndRelayProposalVote.
PIVX-Project · Feb 23, 2022 · a102664 · a102664
1 parent 42bca64
commit a102664
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/src/budget/budgetmanager.cpp b/src/budget/budgetmanager.cpp
@@ -901,16 +901,6 @@ CDataStream CBudgetManager::GetFinalizedBudgetSerialized(const uint256& budgetHa
     return mapFinalizedBudgets.at(budgetHash).GetBroadcast();
 }
 
-bool CBudgetManager::AddAndRelayProposalVote(const CBudgetVote& vote, std::string& strError)
-{
-    if (UpdateProposal(vote, nullptr, strError)) {
-        AddSeenProposalVote(vote);
-        vote.Relay();
-        return true;
-    }
-    return false;
-}
-
 void CBudgetManager::UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload)
 {
     NewBlock();

diff --git a/src/budget/budgetmanager.h b/src/budget/budgetmanager.h
@@ -93,8 +93,6 @@ class CBudgetManager : public CValidationInterface
     CDataStream GetFinalizedBudgetVoteSerialized(const uint256& voteHash) const;
     CDataStream GetFinalizedBudgetSerialized(const uint256& budgetHash) const;
 
-    bool AddAndRelayProposalVote(const CBudgetVote& vote, std::string& strError);
-
     // sets strProposal of a CFinalizedBudget reference
     void SetBudgetProposalsStr(CFinalizedBudget& finalizedBudget) const;
 

diff --git a/src/rpc/budget.cpp b/src/rpc/budget.cpp
@@ -527,11 +527,11 @@ UniValue mnbudgetrawvote(const JSONRPCRequest& request)
         return "Failure to verify signature.";
     }
 
-    std::string strError;
-    if (g_budgetman.AddAndRelayProposalVote(vote, strError)) {
+    CValidationState state;
+    if (g_budgetman.ProcessProposalVote(vote, nullptr, state)) {
         return "Voted successfully";
     } else {
-        return "Error voting : " + strError;
+        return "Error voting : " + state.GetRejectReason() + ". " + state.GetDebugMessage();
     }
 }