From cc383c5fb8f0b0c68c207720b50cb95081fd60fb Mon Sep 17 00:00:00 2001 From: Bart <11445373+bthomee@users.noreply.github.com> Date: Wed, 18 Mar 2026 15:09:46 -0400 Subject: [PATCH] Clang-tidy fixes --- src/libxrpl/shamap/SHAMapSync.cpp | 4 ++-- src/xrpld/app/ledger/detail/InboundLedger.cpp | 4 ++++ src/xrpld/app/ledger/detail/InboundTransactions.cpp | 2 +- src/xrpld/app/ledger/detail/TransactionAcquire.cpp | 2 +- src/xrpld/app/ledger/detail/TransactionAcquire.h | 2 +- src/xrpld/overlay/detail/PeerImp.cpp | 6 ++++++ 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/libxrpl/shamap/SHAMapSync.cpp b/src/libxrpl/shamap/SHAMapSync.cpp index 413e781c93..ff8d7e5f21 100644 --- a/src/libxrpl/shamap/SHAMapSync.cpp +++ b/src/libxrpl/shamap/SHAMapSync.cpp @@ -540,9 +540,9 @@ SHAMap::addKnownNode( SHAMapSyncFilter const* filter) { XRPL_ASSERT(!nodeID.isRoot(), "xrpl::SHAMap::addKnownNode : valid node input"); - if (!nodeID.isRoot()) + if (nodeID.isRoot()) { - JLOG(journal_.error()) << "Non-root node received"; + JLOG(journal_.error()) << "Root node received"; return SHAMapAddNode::invalid(); } XRPL_ASSERT(treeNode, "xrpl::SHAMap::addKnownNode : non-null tree node"); diff --git a/src/xrpld/app/ledger/detail/InboundLedger.cpp b/src/xrpld/app/ledger/detail/InboundLedger.cpp index aa277407b2..1978ef1070 100644 --- a/src/xrpld/app/ledger/detail/InboundLedger.cpp +++ b/src/xrpld/app/ledger/detail/InboundLedger.cpp @@ -875,9 +875,13 @@ InboundLedger::receiveNode(protocol::TMLedgerData& packet, SHAMapAddNode& san) } if (nodeID->isRoot()) + { san += map.addRootNode(rootHash, std::move(*treeNode), f); + } else + { san += map.addKnownNode(*nodeID, std::move(*treeNode), f); + } if (!san.isGood()) { diff --git a/src/xrpld/app/ledger/detail/InboundTransactions.cpp b/src/xrpld/app/ledger/detail/InboundTransactions.cpp index d3425c9bb2..0917ae98d0 100644 --- a/src/xrpld/app/ledger/detail/InboundTransactions.cpp +++ b/src/xrpld/app/ledger/detail/InboundTransactions.cpp @@ -164,7 +164,7 @@ public: data.emplace_back(std::make_pair(*nodeID, std::move(*treeNode))); } - if (!ta->takeNodes(std::move(data), peer).isUseful()) + if (!ta->takeNodes(data, peer).isUseful()) peer->charge(Resource::feeUselessData, "ledger_data not useful"); } diff --git a/src/xrpld/app/ledger/detail/TransactionAcquire.cpp b/src/xrpld/app/ledger/detail/TransactionAcquire.cpp index e2e855132a..7aea4764bb 100644 --- a/src/xrpld/app/ledger/detail/TransactionAcquire.cpp +++ b/src/xrpld/app/ledger/detail/TransactionAcquire.cpp @@ -159,7 +159,7 @@ TransactionAcquire::trigger(std::shared_ptr const& peer) SHAMapAddNode TransactionAcquire::takeNodes( - std::vector>>&& data, + std::vector>> const& data, std::shared_ptr const& peer) { ScopedLockType sl(mtx_); diff --git a/src/xrpld/app/ledger/detail/TransactionAcquire.h b/src/xrpld/app/ledger/detail/TransactionAcquire.h index 21c2db2cfb..dbd1ad6059 100644 --- a/src/xrpld/app/ledger/detail/TransactionAcquire.h +++ b/src/xrpld/app/ledger/detail/TransactionAcquire.h @@ -20,7 +20,7 @@ public: SHAMapAddNode takeNodes( - std::vector>>&& data, + std::vector>> const& data, std::shared_ptr const& peer); void diff --git a/src/xrpld/overlay/detail/PeerImp.cpp b/src/xrpld/overlay/detail/PeerImp.cpp index 2f0fa98984..30346475d4 100644 --- a/src/xrpld/overlay/detail/PeerImp.cpp +++ b/src/xrpld/overlay/detail/PeerImp.cpp @@ -3430,11 +3430,17 @@ PeerImp::processLedgerRequest(std::shared_ptr const& m) // set the `id` field for inner nodes and the `depth` field for leaf nodes. auto const& nodeID = std::get<0>(d); if (!useLedgerNodeDepth) + { node->set_nodeid(nodeID.getRawString()); + } else if (std::get<2>(d)) + { node->set_depth(nodeID.getDepth()); + } else + { node->set_id(nodeID.getRawString()); + } } } else