[Masternde] Refactor activeMasternode.GetKeys callers to not expect a bool.

furszy · Fuzzbawls · commit 626170ec9dcf · 2020-12-16T21:30:53.000-08:00
Github-Pull: #2056 Rebased-From: 89cc583
diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
@@ -232,12 +232,11 @@ bool CActiveMasternode::EnableHotColdMasterNode(CTxIn& newVin, CService& newServ
     return true;
 }
 
-bool CActiveMasternode::GetKeys(CKey& _privKeyMasternode, CPubKey& _pubKeyMasternode)
+void CActiveMasternode::GetKeys(CKey& _privKeyMasternode, CPubKey& _pubKeyMasternode)
 {
     if (!privKeyMasternode.IsValid() || !pubKeyMasternode.IsValid()) {
-        return error("Error trying to get masternode keys");
+        throw std::runtime_error("Error trying to get masternode keys");
     }
     _privKeyMasternode = privKeyMasternode;
     _pubKeyMasternode = pubKeyMasternode;
-    return true;
 }
diff --git a/src/activemasternode.h b/src/activemasternode.h
@@ -57,7 +57,7 @@ class CActiveMasternode
     /// Enable cold wallet mode (run a Masternode with no funds)
     bool EnableHotColdMasterNode(CTxIn& vin, CService& addr);
 
-    bool GetKeys(CKey& privKeyMasternode, CPubKey& pubKeyMasternode);
+    void GetKeys(CKey& privKeyMasternode, CPubKey& pubKeyMasternode);
 };
 
 #endif
diff --git a/src/budget/budgetmanager.cpp b/src/budget/budgetmanager.cpp
@@ -500,9 +500,8 @@ void CBudgetManager::VoteOnFinalizedBudgets()
     // Get masternode keys
     CPubKey pubKeyMasternode;
     CKey keyMasternode;
-    if (!activeMasternode.GetKeys(keyMasternode, pubKeyMasternode)) {
-        return;
-    }
+    activeMasternode.GetKeys(keyMasternode, pubKeyMasternode);
+
     // Sign finalized budgets
     for (const uint256& budgetHash: vBudgetHashes) {
         CFinalizedBudgetVote vote(*(activeMasternode.vin), budgetHash);
diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
@@ -681,10 +681,7 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight)
     }
 
     CPubKey pubKeyMasternode; CKey keyMasternode;
-    if (!activeMasternode.GetKeys(keyMasternode, pubKeyMasternode)) {
-        LogPrint(BCLog::MASTERNODE,"CMasternodePayments::ProcessBlock() - Error upon calling GetKeysFromSecret.\n");
-        return false;
-    }
+    activeMasternode.GetKeys(keyMasternode, pubKeyMasternode);
 
     LogPrint(BCLog::MASTERNODE,"CMasternodePayments::ProcessBlock() - Signing Winner\n");
     if (newWinner.Sign(keyMasternode, pubKeyMasternode)) {
diff --git a/src/rpc/budget.cpp b/src/rpc/budget.cpp
@@ -273,14 +273,8 @@ UniValue mnbudgetvote(const JSONRPCRequest& request)
         UniValue statusObj(UniValue::VOBJ);
 
         while (true) {
-            if (!activeMasternode.GetKeys(keyMasternode, pubKeyMasternode)) {
-                failed++;
-                statusObj.pushKV("node", "local");
-                statusObj.pushKV("result", "failed");
-                statusObj.pushKV("error", "Masternode signing error, GetKeysFromSecret failed.");
-                resultsObj.push_back(statusObj);
-                break;
-            }
+            // Get MN keys
+            activeMasternode.GetKeys(keyMasternode, pubKeyMasternode);
 
             CMasternode* pmn = mnodeman.Find(activeMasternode.vin->prevout);
             if (pmn == NULL) {
@@ -817,9 +811,7 @@ UniValue mnfinalbudget(const JSONRPCRequest& request)
         uint256 hash(uint256S(strHash));
 
         CPubKey pubKeyMasternode; CKey keyMasternode;
-        if (!activeMasternode.GetKeys(keyMasternode, pubKeyMasternode)) {
-            return "Error upon calling GetKeysFromSecret";
-        }
+        activeMasternode.GetKeys(keyMasternode, pubKeyMasternode);
 
         CMasternode* pmn = mnodeman.Find(activeMasternode.vin->prevout);
         if (pmn == NULL) {

Original file line number	Diff line number	Diff line change
`@@ -232,12 +232,11 @@ bool CActiveMasternode::EnableHotColdMasterNode(CTxIn& newVin, CService& newServ`
`232`	`232`	`return true;`
`233`	`233`	`}`
`234`	`234`
`235`		`-bool CActiveMasternode::GetKeys(CKey& _privKeyMasternode, CPubKey& _pubKeyMasternode)`
	`235`	`+void CActiveMasternode::GetKeys(CKey& _privKeyMasternode, CPubKey& _pubKeyMasternode)`
`236`	`236`	`{`
`237`	`237`	`if (!privKeyMasternode.IsValid() \|\| !pubKeyMasternode.IsValid()) {`
`238`		`- return error("Error trying to get masternode keys");`
	`238`	`+ throw std::runtime_error("Error trying to get masternode keys");`
`239`	`239`	`}`
`240`	`240`	`_privKeyMasternode = privKeyMasternode;`
`241`	`241`	`_pubKeyMasternode = pubKeyMasternode;`
`242`		`- return true;`
`243`	`242`	`}`