Skip to content

Commit 2f540be

Browse files
refactor: replace size check with is_single_member() method for clarity
1 parent 7074278 commit 2f540be

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

src/llmq/commitment.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ bool CFinalCommitment::VerifySignatureAsync(CDeterministicMNManager& dmnman, CQu
5151
LogPrint(BCLog::LLMQ, "CFinalCommitment::%s members[%s] quorumPublicKey[%s] commitmentHash[%s]\n", __func__,
5252
ss3.str(), quorumPublicKey.ToString(), commitmentHash.ToString());
5353
}
54-
if (llmq_params.size == 1) {
54+
if (llmq_params.is_single_member()) {
5555
LogPrintf("pubkey operator: %s\n", members[0]->pdmnState->pubKeyOperator.Get().ToString());
5656
if (!membersSig.VerifyInsecure(members[0]->pdmnState->pubKeyOperator.Get(), commitmentHash)) {
5757
LogPrint(BCLog::LLMQ, "CFinalCommitment -- q[%s] invalid member signature\n", quorumHash.ToString());

src/llmq/dkgsessionhandler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ void CDKGSessionHandler::HandleDKGRound(CConnman& connman, PeerManager& peerman)
551551
return changed;
552552
});
553553

554-
if (params.size == 1) {
554+
if (params.is_single_member()) {
555555
auto finalCommitment = curSession->FinalizeSingleCommitment();
556556
if (!finalCommitment.IsNull()) { // it can be null only if we are not member
557557
if (auto inv_opt = quorumBlockProcessor.AddMineableCommitment(finalCommitment); inv_opt.has_value()) {

src/llmq/params.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ struct LLMQParams {
121121

122122
// For how many blocks recent DKG info should be kept
123123
[[nodiscard]] constexpr int max_store_depth() const { return max_cycles(keepOldKeys) * dkgInterval; }
124+
[[nodiscard]] constexpr bool is_single_member() const { return size == 1; }
124125
};
125126

126127
//static_assert(std::is_trivial_v<Consensus::LLMQParams>, "LLMQParams is not a trivial type");

src/llmq/signing_shares.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@ void CSigSharesManager::TryRecoverSig(PeerManager& peerman, const CQuorumCPtr& q
781781
return;
782782
}
783783

784-
if (quorum->params.size == 1) {
784+
if (quorum->params.is_single_member()) {
785785
if (sigSharesForSignHash->empty()) {
786786
LogPrint(BCLog::LLMQ_SIGS, /* Continued */
787787
"CSigSharesManager::%s -- impossible to recover single-node signature - no shares yet. id=%s, "
@@ -1550,7 +1550,7 @@ std::optional<CSigShare> CSigSharesManager::CreateSigShare(const CQuorumCPtr& qu
15501550
return std::nullopt;
15511551
}
15521552

1553-
if (quorum->params.size == 1) {
1553+
if (quorum->params.is_single_member()) {
15541554
int memberIdx = quorum->GetMemberIndex(activeMasterNodeProTxHash);
15551555
if (memberIdx == -1) {
15561556
// this should really not happen (IsValidMember gave true)

src/rpc/quorums.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ static UniValue BuildQuorumInfo(const llmq::CQuorumBlockProcessor& quorum_block_
211211
mo.pushKV("pubKeyOperator", dmn->pdmnState->pubKeyOperator.ToString());
212212
mo.pushKV("valid", static_cast<bool>(quorum->qc->validMembers[i]));
213213
if (quorum->qc->validMembers[i]) {
214-
if (quorum->params.size == 1) {
214+
if (quorum->params.is_single_member()) {
215215
mo.pushKV("pubKeyShare", dmn->pdmnState->pubKeyOperator.ToString());
216216
} else {
217217
CBLSPublicKey pubKey = quorum->GetPubKeyShare(i);

0 commit comments

Comments
 (0)