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

Fix account_tx response both both ledger range and ledger index/hash are specified (#904)

Browse Source 
Fix mismatch with rippled
This commit is contained in:
cyan317
2023-10-09 10:19:07 +01:00
committed by GitHub
parent ac752c656e
commit 64b4a908da
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/rpc/handlers/AccountTx.cpp
View File

@@ -105,8 +105,13 @@ AccountTxHandler::process(AccountTxHandler::Input input, Context const& ctx) con
if (input.ledgerHash || input.ledgerIndex || input.usingValidatedLedger) if (input.ledgerHash || input.ledgerIndex || input.usingValidatedLedger)
{ {
if (ctx.apiVersion > 1u && (input.ledgerIndexMax || input.ledgerIndexMin)) if (ctx.apiVersion > 1u && (input.ledgerIndexMax || input.ledgerIndexMin))
{
return Error{Status{RippledError::rpcINVALID_PARAMS, "containsLedgerSpecifierAndRange"}}; return Error{Status{RippledError::rpcINVALID_PARAMS, "containsLedgerSpecifierAndRange"}};
}
else if (!input.ledgerIndexMax && !input.ledgerIndexMin)
{
// mimic rippled, when both range and index specified, respect the range.
// take ledger from ledgerHash or ledgerIndex only when range is not specified
auto const lgrInfoOrStatus = getLedgerInfoFromHashOrSeq( auto const lgrInfoOrStatus = getLedgerInfoFromHashOrSeq(
*sharedPtrBackend_, ctx.yield, input.ledgerHash, input.ledgerIndex, range->maxSequence); *sharedPtrBackend_, ctx.yield, input.ledgerHash, input.ledgerIndex, range->maxSequence);
@@ -115,6 +120,7 @@ AccountTxHandler::process(AccountTxHandler::Input input, Context const& ctx) con
maxIndex = minIndex = std::get<ripple::LedgerHeader>(lgrInfoOrStatus).seq; maxIndex = minIndex = std::get<ripple::LedgerHeader>(lgrInfoOrStatus).seq;
} }
}
std::optional<data::TransactionsCursor> cursor; std::optional<data::TransactionsCursor> cursor;
@@ -195,9 +201,6 @@ AccountTxHandler::process(AccountTxHandler::Input input, Context const& ctx) con
obj[JS(meta)] = ripple::strHex(txnPlusMeta.metadata); obj[JS(meta)] = ripple::strHex(txnPlusMeta.metadata);
obj[JS(tx_blob)] = ripple::strHex(txnPlusMeta.transaction); obj[JS(tx_blob)] = ripple::strHex(txnPlusMeta.transaction);
obj[JS(ledger_index)] = txnPlusMeta.ledgerSequence; obj[JS(ledger_index)] = txnPlusMeta.ledgerSequence;
if (ctx.apiVersion < 2u)
obj[JS(inLedger)] = txnPlusMeta.ledgerSequence;
} }
obj[JS(validated)] = true; obj[JS(validated)] = true;

10
unittests/rpc/handlers/AccountTxTests.cpp
View File

@@ -371,14 +371,6 @@ TEST_P(AccountTxParameterTest, CheckParams)
} }
else else
{ {
if (req.as_object().contains("ledger_hash"))
{
EXPECT_CALL(*rawBackendPtr, fetchLedgerByHash).WillOnce(testing::Return(ripple::LedgerHeader{}));
}
else if (req.as_object().contains("ledger_index"))
{
EXPECT_CALL(*rawBackendPtr, fetchLedgerBySequence).WillOnce(testing::Return(ripple::LedgerHeader{}));
}
EXPECT_CALL(*rawBackendPtr, fetchAccountTransactions); EXPECT_CALL(*rawBackendPtr, fetchAccountTransactions);
runSpawn([&, this](auto yield) { runSpawn([&, this](auto yield) {
@@ -660,7 +652,7 @@ TEST_F(RPCAccountTxHandlerTest, BinaryTrue)
"144B4E9C06F24296074F7BC48F92A97916C6DC5EA98314D31252CF902EF8DD8451" "144B4E9C06F24296074F7BC48F92A97916C6DC5EA98314D31252CF902EF8DD8451"
"243869B38667CBD89DF3"); "243869B38667CBD89DF3");
EXPECT_FALSE(output->at("transactions").as_array()[0].as_object().contains("date")); EXPECT_FALSE(output->at("transactions").as_array()[0].as_object().contains("date"));
EXPECT_FALSE(output->at("transactions").as_array()[0].as_object().contains("inLedger"));
EXPECT_FALSE(output->as_object().contains("limit")); EXPECT_FALSE(output->as_object().contains("limit"));
}); });
} }