Skip to content

Commit 6834d68

Browse files
committed
fix: removed leftover annotation, as follow-up conflict resolving with #6880
1 parent b57740d commit 6834d68

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

src/masternode/meta.h

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class CMasternodeMetaInfo
2929
public:
3030
uint256 m_protx_hash;
3131

32-
//the dsq count from the last dsq broadcast of this node
32+
//! the dsq count from the last dsq broadcast of this node
3333
int64_t m_last_dsq{0};
3434
int m_mixing_tx_count{0};
3535

@@ -60,17 +60,16 @@ class CMasternodeMetaInfo
6060
obj.m_platform_ban_updated);
6161
}
6262

63-
UniValue ToJson() const EXCLUSIVE_LOCKS_REQUIRED(!cs);
63+
UniValue ToJson() const;
6464

65-
public:
6665
// KEEP TRACK OF EACH GOVERNANCE ITEM IN CASE THIS NODE GOES OFFLINE, SO WE CAN RECALCULATE THEIR STATUS
67-
void AddGovernanceVote(const uint256& nGovernanceObjectHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
68-
69-
void RemoveGovernanceObject(const uint256& nGovernanceObjectHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
66+
void AddGovernanceVote(const uint256& nGovernanceObjectHash);
67+
void RemoveGovernanceObject(const uint256& nGovernanceObjectHash);
7068

7169
void SetLastOutboundAttempt(int64_t t) { lastOutboundAttempt = t; ++outboundAttemptCount; }
7270
void SetLastOutboundSuccess(int64_t t) { lastOutboundSuccess = t; outboundAttemptCount = 0; }
73-
bool SetPlatformBan(bool is_banned, int height) EXCLUSIVE_LOCKS_REQUIRED(!cs)
71+
72+
bool SetPlatformBan(bool is_banned, int height)
7473
{
7574
if (height < m_platform_ban_updated) {
7675
return false;
@@ -205,8 +204,8 @@ class CMasternodeMetaMan : public MasternodeMetaStore
205204
// masternodes before we ever see a masternode that we know already mixed someone's funds earlier.
206205
bool IsDsqOver(const uint256& protx_hash, int mn_count) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
207206

208-
void AllowMixing(const uint256& proTxHash);
209-
void DisallowMixing(const uint256& proTxHash);
207+
void AllowMixing(const uint256& proTxHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
208+
void DisallowMixing(const uint256& proTxHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
210209
bool IsValidForMixingTxes(const uint256& protx_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
211210

212211
void AddGovernanceVote(const uint256& proTxHash, const uint256& nGovernanceObjectHash);

0 commit comments

Comments
 (0)