ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-11-26 22:55:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Compatible feature response (#1539)

Browse Source 
Fixes #1538
This commit is contained in:
Alex Kremer
2024-07-12 15:03:19 +01:00
committed by GitHub
parent 46a616cdad
commit 4f6f717bfb
3 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/rpc/handlers/Feature.cpp
View File

@@ -99,7 +99,10 @@ FeatureHandler::process(FeatureHandler::Input input, Context const& ctx) const
); );
return Output{ return Output{
.features = std::move(features), .ledgerHash = ripple::strHex(lgrInfo.hash), .ledgerIndex = lgrInfo.seq .features = std::move(features),
.ledgerHash = ripple::strHex(lgrInfo.hash),
.ledgerIndex = lgrInfo.seq,
.inlineResult = input.feature.has_value()
}; };
} }
@@ -124,12 +127,18 @@ tag_invoke(boost::json::value_from_tag, boost::json::value& jv, FeatureHandler::
{ {
using boost::json::value_from; using boost::json::value_from;
jv = { if (output.inlineResult) {
{JS(features), value_from(output.features)}, jv = value_from(output.features);
{JS(ledger_hash), output.ledgerHash}, } else {
{JS(ledger_index), output.ledgerIndex}, jv = {
{JS(validated), output.validated}, {JS(features), value_from(output.features)},
}; };
}
auto& obj = jv.as_object();
obj[JS(ledger_hash)] = output.ledgerHash;
obj[JS(ledger_index)] = output.ledgerIndex;
obj[JS(validated)] = output.validated;
} }
void void

3
src/rpc/handlers/Feature.hpp
View File

@@ -71,6 +71,9 @@ public:
std::string ledgerHash; std::string ledgerHash;
uint32_t ledgerIndex{}; uint32_t ledgerIndex{};
// when set to true, output will be inlined in `result` instead of wrapping as `features` inside of `result`.
bool inlineResult = false;
// validated should be sent via framework // validated should be sent via framework
bool validated = true; bool validated = true;
}; };

24
tests/unit/rpc/handlers/FeatureTests.cpp
View File

@@ -257,13 +257,11 @@ TEST_F(RPCFeatureHandlerTest, SuccessPathViaNameWithSingleSupportedAndEnabledRes
auto const expectedOutput = fmt::format( auto const expectedOutput = fmt::format(
R"({{ R"({{
"features": {{ "2E2FB9CF8A44EB80F4694D38AADAE9B8B7ADAFD2F092E10068E61C98C4F092B0":
"2E2FB9CF8A44EB80F4694D38AADAE9B8B7ADAFD2F092E10068E61C98C4F092B0": {{
{{ "name": "fixUniversalNumber",
"name": "fixUniversalNumber", "enabled": true,
"enabled": true, "supported": true
"supported": true
}}
}}, }},
"ledger_hash": "{}", "ledger_hash": "{}",
"ledger_index": {}, "ledger_index": {},
@@ -311,13 +309,11 @@ TEST_F(RPCFeatureHandlerTest, SuccessPathViaHashWithSingleResult)
auto const expectedOutput = fmt::format( auto const expectedOutput = fmt::format(
R"({{ R"({{
"features": {{ "2E2FB9CF8A44EB80F4694D38AADAE9B8B7ADAFD2F092E10068E61C98C4F092B0":
"2E2FB9CF8A44EB80F4694D38AADAE9B8B7ADAFD2F092E10068E61C98C4F092B0": {{
{{ "name": "fixUniversalNumber",
"name": "fixUniversalNumber", "enabled": true,
"enabled": true, "supported": true
"supported": true
}}
}}, }},
"ledger_hash": "{}", "ledger_hash": "{}",
"ledger_index": {}, "ledger_index": {},