fix: follow-up changes for clang-tidy for std::move

Author: knst

src/evo/specialtxman.cpp

@@ -486,7 +486,7 @@ bool CSpecialTxProcessor::BuildNewListFromBlock(const CBlock& block, gsl::not_nu
         newList.UpdateMN(dmn.proTxHash, newState);
     });
 
-    mnListRet = std::move(newList);
+    std::swap(mnListRet, newList);
 
     return true;
 }

src/instantsend/instantsend.cpp

@@ -190,7 +190,7 @@ instantsend::PendingState CInstantSendManager::ProcessPendingInstantSendLocks()
         std::vector<uint256> removed;
         removed.reserve(maxCount);
 
-        for (const auto& [islockHash, nodeid_islptr_pair] : pendingInstantSendLocks) {
+        for (auto& [islockHash, nodeid_islptr_pair] : pendingInstantSendLocks) {
             // Check if we've reached max count
             if (pend.size() >= maxCount) {
                 ret.m_pending_work = true;

src/llmq/blockprocessor.cpp

@@ -438,7 +438,7 @@ bool CQuorumBlockProcessor::GetCommitmentsFromBlock(const CBlock& block, gsl::no
 
     for (const auto& tx : block.vtx) {
         if (tx->nType == TRANSACTION_QUORUM_COMMITMENT) {
-            const auto opt_qc = GetTxPayload<CFinalCommitmentTxPayload>(*tx);
+            auto opt_qc = GetTxPayload<CFinalCommitmentTxPayload>(*tx);
             if (!opt_qc) {
                 // should not happen as it was verified before processing the block
                 LogPrint(BCLog::LLMQ, "CQuorumBlockProcessor::%s height=%d GetTxPayload fails\n", __func__, pindex->nHeight);

src/llmq/snapshot.cpp

@@ -151,12 +151,10 @@ bool BuildQuorumRotationInfo(CDeterministicMNManager& dmnman, CQuorumSnapshotMan
         }
     }
 
-    auto snapshotHMinusC = qsnapman.GetSnapshotForBlock(llmqType, pBlockHMinusCIndex);
-    if (!snapshotHMinusC.has_value()) {
+    response.quorumSnapshotAtHMinusC = qsnapman.GetSnapshotForBlock(llmqType, pBlockHMinusCIndex);
+    if (!response.quorumSnapshotAtHMinusC.has_value()) {
         errorRet = strprintf("Can not find quorum snapshot at H-C");
         return false;
-    } else {
-        response.quorumSnapshotAtHMinusC = std::move(snapshotHMinusC.value());
     }
 
     if (use_legacy_construction) {
@@ -168,12 +166,10 @@ bool BuildQuorumRotationInfo(CDeterministicMNManager& dmnman, CQuorumSnapshotMan
         }
     }
 
-    auto snapshotHMinus2C = qsnapman.GetSnapshotForBlock(llmqType, pBlockHMinus2CIndex);
-    if (!snapshotHMinus2C.has_value()) {
+    response.quorumSnapshotAtHMinus2C = qsnapman.GetSnapshotForBlock(llmqType, pBlockHMinus2CIndex);
+    if (!response.quorumSnapshotAtHMinus2.has_value()) {
         errorRet = strprintf("Can not find quorum snapshot at H-2C");
         return false;
-    } else {
-        response.quorumSnapshotAtHMinus2C = std::move(snapshotHMinus2C.value());
     }
 
     if (use_legacy_construction) {
@@ -185,12 +181,10 @@ bool BuildQuorumRotationInfo(CDeterministicMNManager& dmnman, CQuorumSnapshotMan
         }
     }
 
-    auto snapshotHMinus3C = qsnapman.GetSnapshotForBlock(llmqType, pBlockHMinus3CIndex);
-    if (!snapshotHMinus3C.has_value()) {
+    response.quorumSnapshotAtHMinus3C = qsnapman.GetSnapshotForBlock(llmqType, pBlockHMinus3CIndex);
+    if (!response.quorumSnapshotAtHMinus3C.has_value()) {
         errorRet = strprintf("Can not find quorum snapshot at H-3C");
         return false;
-    } else {
-        response.quorumSnapshotAtHMinus3C = std::move(snapshotHMinus3C.value());
     }
 
     if (request.extraShare) {
@@ -201,25 +195,22 @@ bool BuildQuorumRotationInfo(CDeterministicMNManager& dmnman, CQuorumSnapshotMan
             return false;
         }
 
-        auto snapshotHMinus4C = qsnapman.GetSnapshotForBlock(llmqType, pBlockHMinus4CIndex);
-        if (!snapshotHMinus4C.has_value()) {
+        response.quorumSnapshotAtHMinus4C = qsnapman.GetSnapshotForBlock(llmqType, pBlockHMinus4CIndex);
+        if (!response.quorumSnapshotAtHMinus4C.has_value()) {
             errorRet = strprintf("Can not find quorum snapshot at H-4C");
             return false;
-        } else {
-            response.quorumSnapshotAtHMinus4C = std::move(snapshotHMinus4C.value());
         }
 
-        CSimplifiedMNListDiff mn4c;
+        ;
         if (!BuildSimplifiedMNListDiff(dmnman, chainman, qblockman, qman,
                                        GetLastBaseBlockHash(baseBlockIndexes, pWorkBlockHMinus4CIndex,
                                                             use_legacy_construction),
-                                       pWorkBlockHMinus4CIndex->GetBlockHash(), mn4c, errorRet)) {
+                                       pWorkBlockHMinus4CIndex->GetBlockHash(), response.mnListDiffAtHMinus4C, errorRet)) {
             return false;
         }
         if (!use_legacy_construction) {
             baseBlockIndexes.push_back(pWorkBlockHMinus4CIndex);
         }
-        response.mnListDiffAtHMinus4C = std::move(mn4c);
     } else {
         response.extraShare = false;
     }

src/masternode/meta.cpp

@@ -150,7 +150,7 @@ std::optional<PlatformBanMessage> CMasternodeMetaMan::GetPlatformBan(const uint2
 void CMasternodeMetaMan::RememberPlatformBan(const uint256& inv_hash, PlatformBanMessage&& msg)
 {
     LOCK(cs);
-    m_seen_platform_bans.insert(inv_hash, std::move(msg));
+    m_seen_platform_bans.emplace(inv_hash, std::move(msg));
 }
 
 std::string MasternodeMetaStore::ToString() const

src/rpc/quorums.cpp

@@ -931,7 +931,6 @@ static RPCHelpMan quorum_rotationinfo()
     ;
 
     llmq::CGetQuorumRotationInfo cmd;
-    llmq::CQuorumRotationInfo quorumRotationInfoRet;
     std::string strError;
 
     cmd.blockRequestHash = ParseHashV(request.params[0], "blockRequestHash");
@@ -951,11 +950,13 @@ static RPCHelpMan quorum_rotationinfo()
         }
     }
 
-    LOCK(cs_main);
-
-    if (!BuildQuorumRotationInfo(*CHECK_NONFATAL(node.dmnman), *llmq_ctx.qsnapman, chainman, *llmq_ctx.qman,
-                                 *llmq_ctx.quorum_block_processor, cmd, false, quorumRotationInfoRet, strError)) {
-        throw JSONRPCError(RPC_INVALID_REQUEST, strError);
+    llmq::CQuorumRotationInfo quorumRotationInfoRet;
+    {
+        LOCK(cs_main);
+        if (!BuildQuorumRotationInfo(*CHECK_NONFATAL(node.dmnman), *llmq_ctx.qsnapman, chainman, *llmq_ctx.qman,
+                                     *llmq_ctx.quorum_block_processor, cmd, false, quorumRotationInfoRet, strError)) {
+            throw JSONRPCError(RPC_INVALID_REQUEST, strError);
+        }
     }
 
     return quorumRotationInfoRet.ToJson();

src/script/descriptor.cpp

@@ -619,7 +619,7 @@ class DescriptorImpl : public Descriptor
             assert(outscripts.size() == 1);
             subscripts.emplace_back(std::move(outscripts[0]));
         }
-        out = Merge(std::move(out), std::move(subprovider));
+        out = Merge(out, subprovider);
 
         std::vector<CPubKey> pubkeys;
         pubkeys.reserve(entries.size());