Skip to content

Commit da8a475

Browse files
Merge #6676: refactor: drop message int from template parameter
e42b1b7 refactor: drop message int from template parameter (Konstantin Akimov) Pull request description: ## What was done? Trivial refactoring; dropped unused template argument ## How Has This Been Tested? Run linters ## Breaking Changes N/A ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK e42b1b7 PastaPastaPasta: utACK e42b1b7 Tree-SHA512: 8721e8113e2d390099501b07e81fcce14ca96cbd3fc177461d58150501da0c9817d60104a162a57555d067e8f19dc9b243d7dd702f5506a337e2c0fd41f487fd
2 parents cb86459 + e42b1b7 commit da8a475

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

src/llmq/dkgsessionhandler.cpp

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ static void RelayInvToParticipants(const CDKGSession& session, const CConnman& c
465465
logger.Flush();
466466
}
467467

468-
template <typename Message, int MessageType>
468+
template <typename Message>
469469
bool ProcessPendingMessageBatch(const CConnman& connman, CDKGSession& session, CDKGPendingMessages& pendingMessages,
470470
PeerManager& peerman, size_t maxCount)
471471
{
@@ -573,8 +573,7 @@ void CDKGSessionHandler::HandleDKGRound(CConnman& connman, PeerManager& peerman)
573573
// Contribute
574574
auto fContributeStart = [this, &peerman]() { curSession->Contribute(pendingContributions, peerman); };
575575
auto fContributeWait = [this, &connman, &peerman] {
576-
return ProcessPendingMessageBatch<CDKGContribution, MSG_QUORUM_CONTRIB>(connman, *curSession,
577-
pendingContributions, peerman, 8);
576+
return ProcessPendingMessageBatch<CDKGContribution>(connman, *curSession, pendingContributions, peerman, 8);
578577
};
579578
HandlePhase(QuorumPhase::Contribute, QuorumPhase::Complain, curQuorumHash, 0.05, fContributeStart, fContributeWait);
580579

@@ -583,24 +582,22 @@ void CDKGSessionHandler::HandleDKGRound(CConnman& connman, PeerManager& peerman)
583582
curSession->VerifyAndComplain(connman, pendingComplaints, peerman);
584583
};
585584
auto fComplainWait = [this, &connman, &peerman] {
586-
return ProcessPendingMessageBatch<CDKGComplaint, MSG_QUORUM_COMPLAINT>(connman, *curSession, pendingComplaints,
587-
peerman, 8);
585+
return ProcessPendingMessageBatch<CDKGComplaint>(connman, *curSession, pendingComplaints, peerman, 8);
588586
};
589587
HandlePhase(QuorumPhase::Complain, QuorumPhase::Justify, curQuorumHash, 0.05, fComplainStart, fComplainWait);
590588

591589
// Justify
592590
auto fJustifyStart = [this, &peerman]() { curSession->VerifyAndJustify(pendingJustifications, peerman); };
593591
auto fJustifyWait = [this, &connman, &peerman] {
594-
return ProcessPendingMessageBatch<CDKGJustification, MSG_QUORUM_JUSTIFICATION>(connman, *curSession,
595-
pendingJustifications, peerman, 8);
592+
return ProcessPendingMessageBatch<CDKGJustification>(connman, *curSession, pendingJustifications, peerman, 8);
596593
};
597594
HandlePhase(QuorumPhase::Justify, QuorumPhase::Commit, curQuorumHash, 0.05, fJustifyStart, fJustifyWait);
598595

599596
// Commit
600597
auto fCommitStart = [this, &peerman]() { curSession->VerifyAndCommit(pendingPrematureCommitments, peerman); };
601598
auto fCommitWait = [this, &connman, &peerman] {
602-
return ProcessPendingMessageBatch<CDKGPrematureCommitment, MSG_QUORUM_PREMATURE_COMMITMENT>(
603-
connman, *curSession, pendingPrematureCommitments, peerman, 8);
599+
return ProcessPendingMessageBatch<CDKGPrematureCommitment>(connman, *curSession, pendingPrematureCommitments,
600+
peerman, 8);
604601
};
605602
HandlePhase(QuorumPhase::Commit, QuorumPhase::Finalize, curQuorumHash, 0.1, fCommitStart, fCommitWait);
606603

0 commit comments

Comments
 (0)