Clang-tidy fixes

This commit is contained in:
Bart
2026-03-18 15:09:46 -04:00
parent 88715f1e5a
commit cc383c5fb8
6 changed files with 15 additions and 5 deletions

View File

@@ -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");

View File

@@ -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())
{

View File

@@ -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");
}

View File

@@ -159,7 +159,7 @@ TransactionAcquire::trigger(std::shared_ptr<Peer> const& peer)
SHAMapAddNode
TransactionAcquire::takeNodes(
std::vector<std::pair<SHAMapNodeID, intr_ptr::SharedPtr<SHAMapTreeNode>>>&& data,
std::vector<std::pair<SHAMapNodeID, intr_ptr::SharedPtr<SHAMapTreeNode>>> const& data,
std::shared_ptr<Peer> const& peer)
{
ScopedLockType sl(mtx_);

View File

@@ -20,7 +20,7 @@ public:
SHAMapAddNode
takeNodes(
std::vector<std::pair<SHAMapNodeID, intr_ptr::SharedPtr<SHAMapTreeNode>>>&& data,
std::vector<std::pair<SHAMapNodeID, intr_ptr::SharedPtr<SHAMapTreeNode>>> const& data,
std::shared_ptr<Peer> const& peer);
void

View File

@@ -3430,11 +3430,17 @@ PeerImp::processLedgerRequest(std::shared_ptr<protocol::TMGetLedger> 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