ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-06-03 16:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review feedback

Browse Source
This commit is contained in:
Bart
2026-05-11 17:53:43 -04:00
parent 4e8b6c4176
commit 35ffa71c0b
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/test/app/LedgerNodeHelpers_test.cpp
View File

@@ -235,7 +235,7 @@ class LedgerNodeHelpers_test : public beast::unit_test::Suite
protocol::TMLedgerNode node;
node.set_nodedata(innerData);
node.set_nodeid(innerID.getRawString());
auto const result = getSHAMapNodeID(node, innerNode);
auto const result = getSHAMapNodeID(node, *innerNode);
BEAST_EXPECT(result == innerID);
}
@@ -247,7 +247,7 @@ class LedgerNodeHelpers_test : public beast::unit_test::Suite
protocol::TMLedgerNode node;
node.set_nodedata(innerData);
node.set_id(innerID.getRawString());
auto const result = getSHAMapNodeID(node, innerNode);
auto const result = getSHAMapNodeID(node, *innerNode);
BEAST_EXPECT(result == innerID);
}
@@ -256,7 +256,7 @@ class LedgerNodeHelpers_test : public beast::unit_test::Suite
protocol::TMLedgerNode node;
node.set_nodedata(innerData);
node.set_depth(10);
auto const result = getSHAMapNodeID(node, innerNode);
auto const result = getSHAMapNodeID(node, *innerNode);
BEAST_EXPECT(!result);
}
}
@@ -276,7 +276,7 @@ class LedgerNodeHelpers_test : public beast::unit_test::Suite
protocol::TMLedgerNode ledgerNode;
ledgerNode.set_nodedata(leafData);
ledgerNode.set_nodeid(leafID.getRawString());
auto const result = getSHAMapNodeID(ledgerNode, leafNode);
auto const result = getSHAMapNodeID(ledgerNode, *leafNode);
BEAST_EXPECT(result == leafID);
}
@@ -288,7 +288,7 @@ class LedgerNodeHelpers_test : public beast::unit_test::Suite
protocol::TMLedgerNode ledgerNode;
ledgerNode.set_nodedata(leafData);
ledgerNode.set_id(leafID.getRawString());
auto const result = getSHAMapNodeID(ledgerNode, leafNode);
auto const result = getSHAMapNodeID(ledgerNode, *leafNode);
BEAST_EXPECT(!result);
}
@@ -300,7 +300,7 @@ class LedgerNodeHelpers_test : public beast::unit_test::Suite
protocol::TMLedgerNode node;
node.set_nodedata(leafData);
node.set_depth(kLeafDepth);
auto const result = getSHAMapNodeID(node, leafNode);
auto const result = getSHAMapNodeID(node, *leafNode);
BEAST_EXPECT(result == leafID);
}
@@ -312,7 +312,7 @@ class LedgerNodeHelpers_test : public beast::unit_test::Suite
protocol::TMLedgerNode ledgerNode;
ledgerNode.set_nodedata(leafData);
ledgerNode.set_depth(kLeafDepth);
auto const result = getSHAMapNodeID(ledgerNode, leafNode);
auto const result = getSHAMapNodeID(ledgerNode, *leafNode);
BEAST_EXPECT(result == leafID);
}
@@ -327,7 +327,7 @@ class LedgerNodeHelpers_test : public beast::unit_test::Suite
protocol::TMLedgerNode node;
node.set_nodedata(leafData);
node.set_depth(kLeafDepth);
auto const result = getSHAMapNodeID(node, leafNode);
auto const result = getSHAMapNodeID(node, *leafNode);
BEAST_EXPECT(result == leafID);
}
@@ -344,7 +344,7 @@ class LedgerNodeHelpers_test : public beast::unit_test::Suite
protocol::TMLedgerNode ledgerNode;
ledgerNode.set_nodedata(otherData);
ledgerNode.set_nodeid(otherID.getRawString());
auto const result = getSHAMapNodeID(ledgerNode, leafNode);
auto const result = getSHAMapNodeID(ledgerNode, *leafNode);
BEAST_EXPECT(!result);
}
}

2
src/xrpld/app/ledger/detail/InboundLedger.cpp
View File

@@ -874,7 +874,7 @@ InboundLedger::receiveNode(protocol::TMLedgerData& packet, SHAMapAddNode& san)
return;
}
auto const nodeID = getSHAMapNodeID(ledgerNode, treeNode);
auto const nodeID = getSHAMapNodeID(ledgerNode, *treeNode);
if (!nodeID)
{
JLOG(journal_.warn()) << "Got invalid node id";

2
src/xrpld/app/ledger/detail/InboundTransactions.cpp
View File

@@ -161,7 +161,7 @@ public:
return;
}
auto const nodeID = getSHAMapNodeID(ledgerNode, treeNode);
auto const nodeID = getSHAMapNodeID(ledgerNode, *treeNode);
if (!nodeID)
{
JLOG(j_.warn()) << "Got invalid node id";

14
src/xrpld/app/ledger/detail/LedgerNodeHelpers.cpp
View File

@@ -24,7 +24,7 @@ validateLedgerNode(protocol::TMLedgerNode const& ledgerNode)
if (ledgerNode.has_nodeid())
{
return !ledgerNode.has_id() && !ledgerNode.has_depth() &&
return ledgerNode.reference_case() == ledgerNode.REFERENCE_NOT_SET &&
deserializeSHAMapNodeID(ledgerNode.nodeid()).has_value();
}
@@ -49,11 +49,11 @@ getTreeNode(std::string_view data)
}
std::optional<SHAMapNodeID>
getSHAMapNodeID(protocol::TMLedgerNode const& ledgerNode, SHAMapTreeNodePtr const& treeNode)
getSHAMapNodeID(protocol::TMLedgerNode const& ledgerNode, SHAMapTreeNode const& treeNode)
{
if (ledgerNode.has_id() || ledgerNode.has_depth())
{
if (treeNode->isInner())
if (treeNode.isInner())
{
if (!ledgerNode.has_id())
return std::nullopt;
@@ -61,12 +61,12 @@ getSHAMapNodeID(protocol::TMLedgerNode const& ledgerNode, SHAMapTreeNodePtr cons
return deserializeSHAMapNodeID(ledgerNode.id());
}
if (treeNode->isLeaf())
if (treeNode.isLeaf())
{
if (!ledgerNode.has_depth())
return std::nullopt;
auto const key = safeDowncast<SHAMapLeafNode const*>(treeNode.get())->peekItem()->key();
auto const key = safeDowncast<SHAMapLeafNode const*>(&treeNode)->peekItem()->key();
return SHAMapNodeID::createID(ledgerNode.depth(), key);
}
@@ -81,9 +81,9 @@ getSHAMapNodeID(protocol::TMLedgerNode const& ledgerNode, SHAMapTreeNodePtr cons
if (!nodeID.has_value())
return std::nullopt;
if (treeNode->isLeaf())
if (treeNode.isLeaf())
{
auto const key = safeDowncast<SHAMapLeafNode const*>(treeNode.get())->peekItem()->key();
auto const key = safeDowncast<SHAMapLeafNode const*>(&treeNode)->peekItem()->key();
auto const expectedID = SHAMapNodeID::createID(static_cast<int>(nodeID->getDepth()), key);
if (nodeID->getNodeID() != expectedID.getNodeID())
return std::nullopt;

2
src/xrpld/app/ledger/detail/LedgerNodeHelpers.h
View File

@@ -68,6 +68,6 @@ getTreeNode(std::string_view data);
* `validateLedgerNode` function and obtained a valid tree node by calling `getTreeNode`.
*/
[[nodiscard]] std::optional<SHAMapNodeID>
getSHAMapNodeID(protocol::TMLedgerNode const& ledgerNode, SHAMapTreeNodePtr const& treeNode);
getSHAMapNodeID(protocol::TMLedgerNode const& ledgerNode, SHAMapTreeNode const& treeNode);
} // namespace xrpl