Skip to content

Commit d802b17

Browse files
PastaPastaPastaPastaPastaPasta
committed
lint: re-enable useStlAlgorithm cppcheck
1 parent 0fa7cc8 commit d802b17

18 files changed

Lines changed: 52 additions & 101 deletions

‎src/bench/bls_dkg.cpp‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,16 @@ class DKG
3131
void ReceiveVvecs()
3232
{
3333
receivedVvecs.clear();
34-
for (const auto& member : members) {
35-
receivedVvecs.emplace_back(member.vvec);
36-
}
34+
std::ranges::transform(members, std::back_inserter(receivedVvecs),
35+
[](const auto& member) { return member.vvec; });
3736
quorumVvec = blsWorker.BuildQuorumVerificationVector(receivedVvecs);
3837
}
3938

4039
void ReceiveShares(size_t whoAmI)
4140
{
4241
receivedSkShares.clear();
43-
for (const auto& member : members) {
44-
receivedSkShares.emplace_back(member.skShares[whoAmI]);
45-
}
42+
std::ranges::transform(members, std::back_inserter(receivedSkShares),
43+
[whoAmI](const auto& member) { return member.skShares[whoAmI]; });
4644
}
4745

4846
void VerifyContributionShares(size_t whoAmI, const std::set<size_t>& invalidIndexes, bool aggregated)

‎src/bls/bls.cpp‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ CBLSSecretKey CBLSSecretKey::AggregateInsecure(Span<CBLSSecretKey> sks)
4747

4848
std::vector<bls::PrivateKey> v;
4949
v.reserve(sks.size());
50-
for (const auto& sk : sks) {
51-
v.emplace_back(sk.impl);
52-
}
50+
std::ranges::transform(sks, std::back_inserter(v), [](const auto& sk) { return sk.impl; });
5351

5452
CBLSSecretKey ret;
5553
ret.impl = bls::PrivateKey::Aggregate(v);
@@ -158,9 +156,7 @@ CBLSPublicKey CBLSPublicKey::AggregateInsecure(Span<CBLSPublicKey> pks)
158156

159157
std::vector<bls::G1Element> vecPublicKeys;
160158
vecPublicKeys.reserve(pks.size());
161-
for (const auto& pk : pks) {
162-
vecPublicKeys.emplace_back(pk.impl);
163-
}
159+
std::ranges::transform(pks, std::back_inserter(vecPublicKeys), [](const auto& pk) { return pk.impl; });
164160

165161
CBLSPublicKey ret;
166162
try {
@@ -236,9 +232,7 @@ CBLSSignature CBLSSignature::AggregateInsecure(Span<CBLSSignature> sigs)
236232

237233
std::vector<bls::G2Element> v;
238234
v.reserve(sigs.size());
239-
for (const auto& pk : sigs) {
240-
v.emplace_back(pk.impl);
241-
}
235+
std::ranges::transform(sigs, std::back_inserter(v), [](const auto& sig) { return sig.impl; });
242236

243237
CBLSSignature ret;
244238
try {
@@ -262,15 +256,11 @@ CBLSSignature CBLSSignature::AggregateSecure(Span<CBLSSignature> sigs,
262256

263257
std::vector<bls::G1Element> vecPublicKeys;
264258
vecPublicKeys.reserve(pks.size());
265-
for (const auto& pk : pks) {
266-
vecPublicKeys.push_back(pk.impl);
267-
}
259+
std::ranges::transform(pks, std::back_inserter(vecPublicKeys), [](const auto& pk) { return pk.impl; });
268260

269261
std::vector<bls::G2Element> vecSignatures;
270262
vecSignatures.reserve(pks.size());
271-
for (const auto& sig : sigs) {
272-
vecSignatures.push_back(sig.impl);
273-
}
263+
std::ranges::transform(sigs, std::back_inserter(vecSignatures), [](const auto& sig) { return sig.impl; });
274264

275265
CBLSSignature ret;
276266
try {
@@ -344,9 +334,7 @@ bool CBLSSignature::VerifySecureAggregated(Span<CBLSPublicKey> pks, const uint25
344334

345335
std::vector<bls::G1Element> vecPublicKeys;
346336
vecPublicKeys.reserve(pks.size());
347-
for (const auto& pk : pks) {
348-
vecPublicKeys.push_back(pk.impl);
349-
}
337+
std::ranges::transform(pks, std::back_inserter(vecPublicKeys), [](const auto& pk) { return pk.impl; });
350338

351339
try {
352340
return Scheme(bls::bls_legacy_scheme.load())->VerifySecure(vecPublicKeys, impl, bls::Bytes(hash.begin(), hash.size()));

‎src/coinjoin/client.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,8 @@ std::vector<std::string> CCoinJoinClientManager::getSessionStatuses() const
253253
std::vector<std::string> ret;
254254

255255
LOCK(cs_deqsessions);
256-
for (const auto& session : deqSessions) {
257-
ret.push_back(session.GetStatus(fWaitForBlock).original);
258-
}
256+
std::ranges::transform(deqSessions, std::back_inserter(ret),
257+
[fWaitForBlock](const auto& session) { return session.GetStatus(fWaitForBlock).original; });
259258
return ret;
260259
}
261260

‎src/coinjoin/util.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,9 +280,9 @@ bool CTransactionBuilder::Commit(bilingual_str& strResult)
280280
{
281281
LOCK(cs_outputs);
282282
vecSend.reserve(vecOutputs.size());
283-
for (const auto& out : vecOutputs) {
284-
vecSend.push_back((CRecipient){out->GetScript(), out->GetAmount(), false});
285-
}
283+
std::ranges::transform(vecOutputs, std::back_inserter(vecSend), [](const auto& out) {
284+
return CRecipient{out->GetScript(), out->GetAmount(), false};
285+
});
286286
}
287287

288288
CTransactionRef tx;

‎src/evo/core_write.cpp‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -490,15 +490,11 @@ UniValue CSimplifiedMNListDiff::ToJson(bool extended) const
490490
obj.pushKV("cbTx", EncodeHexTx(CTransaction(cbTx)));
491491

492492
UniValue deletedMNsArr(UniValue::VARR);
493-
for (const auto& h : deletedMNs) {
494-
deletedMNsArr.push_back(h.ToString());
495-
}
493+
std::ranges::for_each(deletedMNs, [&deletedMNsArr](const auto& hash) { deletedMNsArr.push_back(hash.ToString()); });
496494
obj.pushKV("deletedMNs", deletedMNsArr);
497495

498496
UniValue mnListArr(UniValue::VARR);
499-
for (const auto& e : mnList) {
500-
mnListArr.push_back(e.ToJson(extended));
501-
}
497+
std::ranges::for_each(mnList, [&](const auto& entry) { mnListArr.push_back(entry.ToJson(extended)); });
502498
obj.pushKV("mnList", mnListArr);
503499

504500
UniValue deletedQuorumsArr(UniValue::VARR);
@@ -511,9 +507,9 @@ UniValue CSimplifiedMNListDiff::ToJson(bool extended) const
511507
obj.pushKV("deletedQuorums", deletedQuorumsArr);
512508

513509
UniValue newQuorumsArr(UniValue::VARR);
514-
for (const auto& e : newQuorums) {
515-
newQuorumsArr.push_back(e.ToJson());
516-
}
510+
std::ranges::for_each(newQuorums, [&newQuorumsArr](const auto& quorum) {
511+
newQuorumsArr.push_back(quorum.ToJson());
512+
});
517513
obj.pushKV("newQuorums", newQuorumsArr);
518514

519515
// Do not assert special tx type here since this can be called prior to DIP0003 activation

‎src/evo/netinfo.cpp‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,8 @@ UniValue MnNetInfo::ToJson(std::optional<NetInfoPurpose> purpose_opt) const
360360
{
361361
if (purpose_opt) {
362362
UniValue arr(UniValue::VARR);
363-
for (const auto& entry : GetEntries(purpose_opt)) {
364-
arr.push_back(entry.ToStringAddrPort());
365-
}
363+
std::ranges::for_each(GetEntries(purpose_opt),
364+
[&arr](const auto& entry) { arr.push_back(entry.ToStringAddrPort()); });
366365
return arr;
367366
}
368367

@@ -640,18 +639,15 @@ UniValue ExtNetInfo::ToJson(std::optional<NetInfoPurpose> purpose_opt) const
640639
// Report only a subset of all addresses if supplied a purpose code
641640
if (purpose_opt) {
642641
UniValue arr(UniValue::VARR);
643-
for (const auto& entry : GetEntries(purpose_opt)) {
644-
arr.push_back(entry.ToStringAddrPort());
645-
}
642+
std::ranges::for_each(GetEntries(purpose_opt),
643+
[&arr](const auto& entry) { arr.push_back(entry.ToStringAddrPort()); });
646644
return arr;
647645
}
648646

649647
UniValue ret(UniValue::VOBJ);
650648
for (const auto& [purpose, entries] : m_data) {
651649
UniValue arr(UniValue::VARR);
652-
for (const auto& entry : entries) {
653-
arr.push_back(entry.ToStringAddrPort());
654-
}
650+
std::ranges::for_each(entries, [&arr](const auto& entry) { arr.push_back(entry.ToStringAddrPort()); });
655651
ret.pushKV(PurposeToString(purpose).data(), arr);
656652
}
657653
return ret;

‎src/evo/simplifiedmns.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,7 @@ uint256 CSimplifiedMNList::CalcMerkleRoot(bool* pmutated) const
8181
{
8282
std::vector<uint256> leaves;
8383
leaves.reserve(mnList.size());
84-
for (const auto& e : mnList) {
85-
leaves.emplace_back(e->CalcHash());
86-
}
84+
std::ranges::transform(mnList, std::back_inserter(leaves), [](const auto& entry) { return entry->CalcHash(); });
8785
return ComputeMerkleRoot(leaves, pmutated);
8886
}
8987

‎src/evo/smldiff.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,7 @@ bool BuildSimplifiedMNListDiff(CDeterministicMNManager& dmnman, const Chainstate
215215

216216
std::vector<uint256> vHashes;
217217
std::vector<bool> vMatch(block.vtx.size(), false);
218-
for (const auto& tx : block.vtx) {
219-
vHashes.emplace_back(tx->GetHash());
220-
}
218+
std::ranges::transform(block.vtx, std::back_inserter(vHashes), [](const auto& tx) { return tx->GetHash(); });
221219
vMatch[0] = true; // only coinbase matches
222220
mnListDiffRet.cbTxMerkleTree = CPartialMerkleTree(vHashes, vMatch);
223221

‎src/governance/superblock.cpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -377,11 +377,8 @@ bool CSuperblock::IsExpired(int heightToTest) const
377377
std::vector<uint256> CSuperblock::GetProposalHashes() const
378378
{
379379
std::vector<uint256> res;
380-
381-
for (const auto& payment : vecPayments) {
382-
res.push_back(payment.proposalHash);
383-
}
384-
380+
std::ranges::transform(vecPayments, std::back_inserter(res),
381+
[](const auto& payment) { return payment.proposalHash; });
385382
return res;
386383
}
387384

‎src/llmq/core_write.cpp‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -200,21 +200,18 @@ UniValue CQuorumRotationInfo::ToJson() const
200200
obj.pushKV("mnListDiffAtHMinus4C", CHECK_NONFATAL(cycleHMinus4C)->m_diff.ToJson());
201201
}
202202
UniValue hqclists(UniValue::VARR);
203-
for (const auto& qc : lastCommitmentPerIndex) {
204-
hqclists.push_back(qc.ToJson());
205-
}
203+
std::ranges::for_each(lastCommitmentPerIndex,
204+
[&hqclists](const auto& commitment) { hqclists.push_back(commitment.ToJson()); });
206205
obj.pushKV("lastCommitmentPerIndex", hqclists);
207206

208207
UniValue snapshotlist(UniValue::VARR);
209-
for (const auto& snap : quorumSnapshotList) {
210-
snapshotlist.push_back(snap.ToJson());
211-
}
208+
std::ranges::for_each(quorumSnapshotList,
209+
[&snapshotlist](const auto& snapshot) { snapshotlist.push_back(snapshot.ToJson()); });
212210
obj.pushKV("quorumSnapshotList", snapshotlist);
213211

214212
UniValue mnlistdifflist(UniValue::VARR);
215-
for (const auto& mnlist : mnListDiffList) {
216-
mnlistdifflist.push_back(mnlist.ToJson());
217-
}
213+
std::ranges::for_each(mnListDiffList,
214+
[&mnlistdifflist](const auto& diff) { mnlistdifflist.push_back(diff.ToJson()); });
218215
obj.pushKV("mnListDiffList", mnlistdifflist);
219216
return obj;
220217
}

0 commit comments

Comments
 (0)