trivial: activemasternode clang-tidy cleanups

furszy · furszy · commit 6e9b6ee99889 · 2022-02-10T13:02:01.000-03:00
diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
@@ -76,7 +76,7 @@ OperationResult CActiveDeterministicMasternodeManager::SetOperatorKey(const std:
     }
     info.keyOperator = *opSk;
     info.pubKeyOperator = info.keyOperator.GetPublicKey();
-    return OperationResult(true);
+    return {true};
 }
 
 OperationResult CActiveDeterministicMasternodeManager::GetOperatorKey(CBLSSecretKey& key, CDeterministicMNCPtr& dmn) const
@@ -93,7 +93,7 @@ OperationResult CActiveDeterministicMasternodeManager::GetOperatorKey(CBLSSecret
     }
     // return key
     key = info.keyOperator;
-    return OperationResult(true);
+    return {true};
 }
 
 void CActiveDeterministicMasternodeManager::Init(const CBlockIndex* pindexTip)
@@ -266,7 +266,7 @@ OperationResult initMasternode(const std::string& _strMasterNodePrivKey, const s
         return errorOut(strprintf(_("Invalid -masternodeaddr port %d, only %d is supported on %s-net."),
                                            nPort, nDefaultPort, Params().NetworkIDString()));
     }
-    CService addrTest(LookupNumeric(strHost.c_str(), nPort));
+    CService addrTest(LookupNumeric(strHost, nPort));
     if (!addrTest.IsValid()) {
         return errorOut(strprintf(_("Invalid -masternodeaddr address: %s"), _strMasterNodeAddr));
     }
@@ -295,7 +295,7 @@ OperationResult initMasternode(const std::string& _strMasterNodePrivKey, const s
         if (pmn) activeMasternode.EnableHotColdMasterNode(pmn->vin, pmn->addr);
     }
 
-    return OperationResult(true);
+    return {true};
 }
 
 //
@@ -426,7 +426,7 @@ bool CActiveMasternode::SendMasternodePing(std::string& errorMessage)
 
     // Update lastPing for our masternode in Masternode list
     CMasternode* pmn = mnodeman.Find(vin->prevout);
-    if (pmn != NULL) {
+    if (pmn != nullptr) {
         if (pmn->IsPingedWithin(MasternodePingSeconds(), mnp.sigTime)) {
             errorMessage = "Too early to send Masternode Ping";
             return false;
@@ -473,7 +473,7 @@ bool CActiveMasternode::EnableHotColdMasterNode(CTxIn& newVin, CService& newServ
     return true;
 }
 
-void CActiveMasternode::GetKeys(CKey& _privKeyMasternode, CPubKey& _pubKeyMasternode)
+void CActiveMasternode::GetKeys(CKey& _privKeyMasternode, CPubKey& _pubKeyMasternode) const
 {
     if (!privKeyMasternode.IsValid() || !pubKeyMasternode.IsValid()) {
         throw std::runtime_error("Error trying to get masternode keys");
diff --git a/src/activemasternode.h b/src/activemasternode.h
@@ -52,8 +52,8 @@ class CActiveDeterministicMasternodeManager : public CValidationInterface
     CActiveMasternodeInfo info;
 
 public:
-    virtual ~CActiveDeterministicMasternodeManager() = default;
-    virtual void UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload);
+    ~CActiveDeterministicMasternodeManager() override = default;
+    void UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload) override;
 
     void Init(const CBlockIndex* pindexTip);
     void Reset(masternode_state_t _state, const CBlockIndex* pindexTip);
@@ -106,7 +106,7 @@ class CActiveMasternode
     /// Enable cold wallet mode (run a Masternode with no funds)
     bool EnableHotColdMasterNode(CTxIn& vin, CService& addr);
 
-    void GetKeys(CKey& privKeyMasternode, CPubKey& pubKeyMasternode);
+    void GetKeys(CKey& privKeyMasternode, CPubKey& pubKeyMasternode) const;
 };
 
 // Compatibility code: get vin and keys for either legacy or deterministic masternode

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ OperationResult CActiveDeterministicMasternodeManager::SetOperatorKey(const std:`
`76`	`76`	`}`
`77`	`77`	`info.keyOperator = *opSk;`
`78`	`78`	`info.pubKeyOperator = info.keyOperator.GetPublicKey();`
`79`		`- return OperationResult(true);`
	`79`	`+ return {true};`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`OperationResult CActiveDeterministicMasternodeManager::GetOperatorKey(CBLSSecretKey& key, CDeterministicMNCPtr& dmn) const`
`@@ -93,7 +93,7 @@ OperationResult CActiveDeterministicMasternodeManager::GetOperatorKey(CBLSSecret`
`93`	`93`	`}`
`94`	`94`	`// return key`
`95`	`95`	`key = info.keyOperator;`
`96`		`- return OperationResult(true);`
	`96`	`+ return {true};`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`void CActiveDeterministicMasternodeManager::Init(const CBlockIndex* pindexTip)`
`@@ -266,7 +266,7 @@ OperationResult initMasternode(const std::string& _strMasterNodePrivKey, const s`
`266`	`266`	`return errorOut(strprintf(_("Invalid -masternodeaddr port %d, only %d is supported on %s-net."),`
`267`	`267`	`nPort, nDefaultPort, Params().NetworkIDString()));`
`268`	`268`	`}`
`269`		`- CService addrTest(LookupNumeric(strHost.c_str(), nPort));`
	`269`	`+ CService addrTest(LookupNumeric(strHost, nPort));`
`270`	`270`	`if (!addrTest.IsValid()) {`
`271`	`271`	`return errorOut(strprintf(_("Invalid -masternodeaddr address: %s"), _strMasterNodeAddr));`
`272`	`272`	`}`
`@@ -295,7 +295,7 @@ OperationResult initMasternode(const std::string& _strMasterNodePrivKey, const s`
`295`	`295`	`if (pmn) activeMasternode.EnableHotColdMasterNode(pmn->vin, pmn->addr);`
`296`	`296`	`}`
`297`	`297`
`298`		`- return OperationResult(true);`
	`298`	`+ return {true};`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`//`
`@@ -426,7 +426,7 @@ bool CActiveMasternode::SendMasternodePing(std::string& errorMessage)`
`426`	`426`
`427`	`427`	`// Update lastPing for our masternode in Masternode list`
`428`	`428`	`CMasternode* pmn = mnodeman.Find(vin->prevout);`
`429`		`- if (pmn != NULL) {`
	`429`	`+ if (pmn != nullptr) {`
`430`	`430`	`if (pmn->IsPingedWithin(MasternodePingSeconds(), mnp.sigTime)) {`
`431`	`431`	`errorMessage = "Too early to send Masternode Ping";`
`432`	`432`	`return false;`
`@@ -473,7 +473,7 @@ bool CActiveMasternode::EnableHotColdMasterNode(CTxIn& newVin, CService& newServ`
`473`	`473`	`return true;`
`474`	`474`	`}`
`475`	`475`
`476`		`-void CActiveMasternode::GetKeys(CKey& _privKeyMasternode, CPubKey& _pubKeyMasternode)`
	`476`	`+void CActiveMasternode::GetKeys(CKey& _privKeyMasternode, CPubKey& _pubKeyMasternode) const`
`477`	`477`	`{`
`478`	`478`	`if (!privKeyMasternode.IsValid() \|\| !pubKeyMasternode.IsValid()) {`
`479`	`479`	`throw std::runtime_error("Error trying to get masternode keys");`