Skip to content

Commit b478406

Browse files
knstknst
committed
refactor: clean-up, missing const in rpc/quorums
1 parent 50c99e8 commit b478406

File tree

1 file changed

+35
-42
lines changed

1 file changed

+35
-42
lines changed

‎src/rpc/quorums.cpp‎

Lines changed: 35 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ static RPCHelpMan quorum_list()
7676
CBlockIndex* pindexTip = WITH_LOCK(cs_main, return chainman.ActiveChain().Tip());
7777

7878
for (const auto& type : llmq::GetEnabledQuorumTypes(pindexTip)) {
79-
const auto& llmq_params_opt = Params().GetLLMQ(type);
79+
const auto llmq_params_opt = Params().GetLLMQ(type);
8080
CHECK_NONFATAL(llmq_params_opt.has_value());
8181
UniValue v(UniValue::VARR);
8282

@@ -142,7 +142,7 @@ static RPCHelpMan quorum_list_extended()
142142
CBlockIndex* pblockindex = nHeight != -1 ? WITH_LOCK(cs_main, return chainman.ActiveChain()[nHeight]) : WITH_LOCK(cs_main, return chainman.ActiveChain().Tip());
143143

144144
for (const auto& type : llmq::GetEnabledQuorumTypes(pblockindex)) {
145-
const auto& llmq_params_opt = Params().GetLLMQ(type);
145+
const auto llmq_params_opt = Params().GetLLMQ(type);
146146
CHECK_NONFATAL(llmq_params_opt.has_value());
147147
const auto& llmq_params = llmq_params_opt.value();
148148
UniValue v(UniValue::VARR);
@@ -241,12 +241,12 @@ static RPCHelpMan quorum_info()
241241
const NodeContext& node = EnsureAnyNodeContext(request.context);
242242
const LLMQContext& llmq_ctx = EnsureLLMQContext(node);
243243

244-
Consensus::LLMQType llmqType = (Consensus::LLMQType)ParseInt32V(request.params[0], "llmqType");
244+
const Consensus::LLMQType llmqType{static_cast<Consensus::LLMQType>(ParseInt32V(request.params[0], "llmqType"))};
245245
if (!Params().GetLLMQ(llmqType).has_value()) {
246246
throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid LLMQ type");
247247
}
248248

249-
uint256 quorumHash(ParseHashV(request.params[1], "quorumHash"));
249+
const uint256 quorumHash(ParseHashV(request.params[1], "quorumHash"));
250250
bool includeSkShare = false;
251251
if (!request.params[2].isNull()) {
252252
includeSkShare = ParseBoolV(request.params[2], "includeSkShare");
@@ -300,7 +300,7 @@ static RPCHelpMan quorum_dkgstatus()
300300
UniValue minableCommitments(UniValue::VARR);
301301
UniValue quorumArrConnections(UniValue::VARR);
302302
for (const auto& type : llmq::GetEnabledQuorumTypes(pindexTip)) {
303-
const auto& llmq_params_opt = Params().GetLLMQ(type);
303+
const auto llmq_params_opt = Params().GetLLMQ(type);
304304
CHECK_NONFATAL(llmq_params_opt.has_value());
305305
const auto& llmq_params = llmq_params_opt.value();
306306
bool rotation_enabled = llmq::IsQuorumRotationEnabled(llmq_params, pindexTip);
@@ -400,7 +400,7 @@ static RPCHelpMan quorum_memberof()
400400

401401
UniValue result(UniValue::VARR);
402402
for (const auto& type : llmq::GetEnabledQuorumTypes(pindexTip)) {
403-
const auto& llmq_params_opt = Params().GetLLMQ(type);
403+
const auto llmq_params_opt = Params().GetLLMQ(type);
404404
CHECK_NONFATAL(llmq_params_opt.has_value());
405405
size_t count = llmq_params_opt->signingActiveQuorumCount;
406406
if (scanQuorumsCount != -1) {
@@ -441,15 +441,14 @@ static RPCHelpMan quorum_sign()
441441
const NodeContext& node = EnsureAnyNodeContext(request.context);
442442
const LLMQContext& llmq_ctx = EnsureLLMQContext(node);
443443

444-
Consensus::LLMQType llmqType = (Consensus::LLMQType)ParseInt32V(request.params[0], "llmqType");
445-
446-
const auto& llmq_params_opt = Params().GetLLMQ(llmqType);
444+
const Consensus::LLMQType llmqType{static_cast<Consensus::LLMQType>(ParseInt32V(request.params[0], "llmqType"))};
445+
const auto llmq_params_opt = Params().GetLLMQ(llmqType);
447446
if (!llmq_params_opt.has_value()) {
448447
throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid LLMQ type");
449448
}
450449

451-
uint256 id(ParseHashV(request.params[1], "id"));
452-
uint256 msgHash(ParseHashV(request.params[2], "msgHash"));
450+
const uint256 id(ParseHashV(request.params[1], "id"));
451+
const uint256 msgHash(ParseHashV(request.params[2], "msgHash"));
453452

454453
uint256 quorumHash;
455454
if (!request.params[3].isNull() && !request.params[3].get_str().empty()) {
@@ -518,15 +517,15 @@ static RPCHelpMan quorum_verify()
518517
const NodeContext& node = EnsureAnyNodeContext(request.context);
519518
const LLMQContext& llmq_ctx = EnsureLLMQContext(node);
520519

521-
Consensus::LLMQType llmqType = (Consensus::LLMQType)ParseInt32V(request.params[0], "llmqType");
520+
const Consensus::LLMQType llmqType{static_cast<Consensus::LLMQType>(ParseInt32V(request.params[0], "llmqType"))};
522521

523-
const auto& llmq_params_opt = Params().GetLLMQ(llmqType);
522+
const auto llmq_params_opt = Params().GetLLMQ(llmqType);
524523
if (!llmq_params_opt.has_value()) {
525524
throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid LLMQ type");
526525
}
527526

528-
uint256 id(ParseHashV(request.params[1], "id"));
529-
uint256 msgHash(ParseHashV(request.params[2], "msgHash"));
527+
const uint256 id(ParseHashV(request.params[1], "id"));
528+
const uint256 msgHash(ParseHashV(request.params[2], "msgHash"));
530529

531530
const bool use_bls_legacy = bls::bls_legacy_scheme.load();
532531
CBLSSignature sig;
@@ -574,15 +573,13 @@ static RPCHelpMan quorum_hasrecsig()
574573
const NodeContext& node = EnsureAnyNodeContext(request.context);
575574
const LLMQContext& llmq_ctx = EnsureLLMQContext(node);
576575

577-
Consensus::LLMQType llmqType = (Consensus::LLMQType)ParseInt32V(request.params[0], "llmqType");
578-
579-
const auto& llmq_params_opt = Params().GetLLMQ(llmqType);
580-
if (!llmq_params_opt.has_value()) {
576+
const Consensus::LLMQType llmqType{static_cast<Consensus::LLMQType>(ParseInt32V(request.params[0], "llmqType"))};
577+
if (!Params().GetLLMQ(llmqType).has_value()) {
581578
throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid LLMQ type");
582579
}
583580

584-
uint256 id(ParseHashV(request.params[1], "id"));
585-
uint256 msgHash(ParseHashV(request.params[2], "msgHash"));
581+
const uint256 id(ParseHashV(request.params[1], "id"));
582+
const uint256 msgHash(ParseHashV(request.params[2], "msgHash"));
586583

587584
return llmq_ctx.sigman->HasRecoveredSig(llmqType, id, msgHash);
588585
},
@@ -605,15 +602,13 @@ static RPCHelpMan quorum_getrecsig()
605602
const NodeContext& node = EnsureAnyNodeContext(request.context);
606603
const LLMQContext& llmq_ctx = EnsureLLMQContext(node);
607604

608-
Consensus::LLMQType llmqType = (Consensus::LLMQType)ParseInt32V(request.params[0], "llmqType");
609-
610-
const auto& llmq_params_opt = Params().GetLLMQ(llmqType);
611-
if (!llmq_params_opt.has_value()) {
605+
const Consensus::LLMQType llmqType{static_cast<Consensus::LLMQType>(ParseInt32V(request.params[0], "llmqType"))};
606+
if (!Params().GetLLMQ(llmqType).has_value()) {
612607
throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid LLMQ type");
613608
}
614609

615-
uint256 id(ParseHashV(request.params[1], "id"));
616-
uint256 msgHash(ParseHashV(request.params[2], "msgHash"));
610+
const uint256 id(ParseHashV(request.params[1], "id"));
611+
const uint256 msgHash(ParseHashV(request.params[2], "msgHash"));
617612

618613
llmq::CRecoveredSig recSig;
619614
if (!llmq_ctx.sigman->GetRecoveredSigForId(llmqType, id, recSig)) {
@@ -643,15 +638,13 @@ static RPCHelpMan quorum_isconflicting()
643638
const NodeContext& node = EnsureAnyNodeContext(request.context);
644639
const LLMQContext& llmq_ctx = EnsureLLMQContext(node);
645640

646-
Consensus::LLMQType llmqType = (Consensus::LLMQType)ParseInt32V(request.params[0], "llmqType");
647-
648-
const auto& llmq_params_opt = Params().GetLLMQ(llmqType);
649-
if (!llmq_params_opt.has_value()) {
641+
const Consensus::LLMQType llmqType{static_cast<Consensus::LLMQType>(ParseInt32V(request.params[0], "llmqType"))};
642+
if (!Params().GetLLMQ(llmqType).has_value()) {
650643
throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid LLMQ type");
651644
}
652645

653-
uint256 id(ParseHashV(request.params[1], "id"));
654-
uint256 msgHash(ParseHashV(request.params[2], "msgHash"));
646+
const uint256 id(ParseHashV(request.params[1], "id"));
647+
const uint256 msgHash(ParseHashV(request.params[2], "msgHash"));
655648

656649
return llmq_ctx.sigman->IsConflicting(llmqType, id, msgHash);
657650
},
@@ -673,17 +666,17 @@ static RPCHelpMan quorum_selectquorum()
673666
const NodeContext& node = EnsureAnyNodeContext(request.context);
674667
const LLMQContext& llmq_ctx = EnsureLLMQContext(node);
675668

676-
Consensus::LLMQType llmqType = (Consensus::LLMQType)ParseInt32V(request.params[0], "llmqType");
677-
const auto& llmq_params_opt = Params().GetLLMQ(llmqType);
669+
const Consensus::LLMQType llmqType{static_cast<Consensus::LLMQType>(ParseInt32V(request.params[0], "llmqType"))};
670+
const auto llmq_params_opt = Params().GetLLMQ(llmqType);
678671
if (!llmq_params_opt.has_value()) {
679672
throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid LLMQ type");
680673
}
681674

682-
uint256 id(ParseHashV(request.params[1], "id"));
675+
const uint256 id(ParseHashV(request.params[1], "id"));
683676

684677
UniValue ret(UniValue::VOBJ);
685678

686-
auto quorum = llmq::SelectQuorumForSigning(llmq_params_opt.value(), *llmq_ctx.qman, id);
679+
const auto quorum = llmq::SelectQuorumForSigning(llmq_params_opt.value(), *llmq_ctx.qman, id);
687680
if (!quorum) {
688681
throw JSONRPCError(RPC_MISC_ERROR, "no quorums active");
689682
}
@@ -973,8 +966,8 @@ static RPCHelpMan verifyislock()
973966
RPCExamples{""},
974967
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
975968
{
976-
uint256 id(ParseHashV(request.params[0], "id"));
977-
uint256 txid(ParseHashV(request.params[1], "txid"));
969+
const uint256 id(ParseHashV(request.params[0], "id"));
970+
const uint256 txid(ParseHashV(request.params[1], "txid"));
978971

979972
const NodeContext& node = EnsureAnyNodeContext(request.context);
980973
const ChainstateManager& chainman = EnsureChainman(node);
@@ -983,7 +976,7 @@ static RPCHelpMan verifyislock()
983976
g_txindex->BlockUntilSyncedToCurrentChain();
984977
}
985978

986-
CBlockIndex* pindexMined{nullptr};
979+
const CBlockIndex* pindexMined{nullptr};
987980
{
988981
LOCK(cs_main);
989982
uint256 hash_block;
@@ -1027,9 +1020,9 @@ static RPCHelpMan verifyislock()
10271020

10281021
auto llmqType = Params().GetConsensus().llmqTypeDIP0024InstantSend;
10291022
// First check against the current active set, if it fails check against the last active set
1030-
const auto& llmq_params_opt = Params().GetLLMQ(llmqType);
1023+
const auto llmq_params_opt = Params().GetLLMQ(llmqType);
10311024
CHECK_NONFATAL(llmq_params_opt.has_value());
1032-
int signOffset{llmq_params_opt->dkgInterval};
1025+
const int signOffset{llmq_params_opt->dkgInterval};
10331026
return llmq::VerifyRecoveredSig(llmqType, *llmq_ctx.qman, signHeight, id, txid, sig, 0) ||
10341027
llmq::VerifyRecoveredSig(llmqType, *llmq_ctx.qman, signHeight, id, txid, sig, signOffset);
10351028
},

0 commit comments

Comments
 (0)