refactor: replace direct call of MetaInfo from rpc/evo code to helper

knst · knst · commit 6cb2344a0090 · 2025-11-04T21:19:27.000+07:00
diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
@@ -66,6 +66,14 @@ void CMasternodeMetaInfo::RemoveGovernanceObject(const uint256& nGovernanceObjec
     mapGovernanceObjectsVotedOn.erase(nGovernanceObjectHash);
 }
 
+CMasternodeMetaInfo CMasternodeMetaMan::GetInfo(const uint256& proTxHash)
+{
+    const auto info = GetMetaInfo(proTxHash, false);
+    if (info == nullptr) return CMasternodeMetaInfo{};
+
+    return *info;
+}
+
 CMasternodeMetaInfoPtr CMasternodeMetaMan::GetMetaInfo(const uint256& proTxHash, bool fCreate)
 {
     LOCK(cs);
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
@@ -259,6 +259,7 @@ class CMasternodeMetaMan : public MasternodeMetaStore
 
     bool IsValid() const { return is_valid; }
 
+    CMasternodeMetaInfo GetInfo(const uint256& proTxHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     CMasternodeMetaInfoPtr GetMetaInfo(const uint256& proTxHash, bool fCreate = true) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     int64_t GetDsqCount() const { return nDsqCount; }
diff --git a/src/rpc/evo.cpp b/src/rpc/evo.cpp
@@ -1379,8 +1379,7 @@ static UniValue BuildDMNListEntry(const CWallet* const pwallet, const CDetermini
     }
 #endif
 
-    const auto metaInfo = mn_metaman.GetMetaInfo(dmn.proTxHash);
-    o.pushKV("metaInfo", metaInfo->ToJson());
+    o.pushKV("metaInfo", mn_metaman.GetInfo(dmn.proTxHash).ToJson());
 
     return o;
 }

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,14 @@ void CMasternodeMetaInfo::RemoveGovernanceObject(const uint256& nGovernanceObjec`
`66`	`66`	`mapGovernanceObjectsVotedOn.erase(nGovernanceObjectHash);`
`67`	`67`	`}`
`68`	`68`
	`69`	`+CMasternodeMetaInfo CMasternodeMetaMan::GetInfo(const uint256& proTxHash)`
	`70`	`+{`
	`71`	`+ const auto info = GetMetaInfo(proTxHash, false);`
	`72`	`+ if (info == nullptr) return CMasternodeMetaInfo{};`
	`73`	`+`
	`74`	`+ return *info;`
	`75`	`+}`
	`76`	`+`
`69`	`77`	`CMasternodeMetaInfoPtr CMasternodeMetaMan::GetMetaInfo(const uint256& proTxHash, bool fCreate)`
`70`	`78`	`{`
`71`	`79`	`LOCK(cs);`
Original file line number	Diff line number	Diff line change
`@@ -1379,8 +1379,7 @@ static UniValue BuildDMNListEntry(const CWallet* const pwallet, const CDetermini`
`1379`	`1379`	`}`
`1380`	`1380`	`#endif`
`1381`	`1381`
`1382`		`- const auto metaInfo = mn_metaman.GetMetaInfo(dmn.proTxHash);`
`1383`		`- o.pushKV("metaInfo", metaInfo->ToJson());`
	`1382`	`+ o.pushKV("metaInfo", mn_metaman.GetInfo(dmn.proTxHash).ToJson());`
`1384`	`1383`
`1385`	`1384`	`return o;`
`1386`	`1385`	`}`