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

Fix ledger close_time_iso(#1008)

Browse Source 
Fix #1007
This commit is contained in:
cyan317
2023-11-29 18:04:12 +00:00
committed by GitHub
parent c2b462da75
commit dd018f1c5e
2 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/rpc/handlers/Ledger.cpp
View File

@@ -79,8 +79,9 @@ LedgerHandler::process(LedgerHandler::Input input, Context const& ctx) const
return toJsonWithBinaryTx(tx, ctx.apiVersion);
};
auto const isoTimeStr = ripple::to_string_iso(lgrInfo.closeTime);
auto const expandTxJsonV2 = [&](data::TransactionAndMetadata const& tx) {
static auto const isoTimeStr = ripple::to_string_iso(lgrInfo.closeTime);
auto [txn, meta] = toExpandedJson(tx, ctx.apiVersion);
if (!input.binary) {
boost::json::object entry;

51
unittests/rpc/handlers/LedgerTests.cpp
View File

@@ -711,6 +711,57 @@ TEST_F(RPCLedgerHandlerTest, TransactionsExpandNotBinaryV2)
});
}
TEST_F(RPCLedgerHandlerTest, TwoRequestInARowTransactionsExpandNotBinaryV2)
{
auto const rawBackendPtr = dynamic_cast<MockBackend*>(mockBackendPtr.get());
ASSERT_NE(rawBackendPtr, nullptr);
mockBackendPtr->updateRange(RANGEMIN);
mockBackendPtr->updateRange(RANGEMAX);
auto const ledgerinfo = CreateLedgerInfo(LEDGERHASH, RANGEMAX);
EXPECT_CALL(*rawBackendPtr, fetchLedgerBySequence(RANGEMAX, _)).WillOnce(Return(ledgerinfo));
auto const ledgerinfo2 = CreateLedgerInfo(LEDGERHASH, RANGEMAX - 1, 10);
EXPECT_CALL(*rawBackendPtr, fetchLedgerBySequence(RANGEMAX - 1, _)).WillOnce(Return(ledgerinfo2));
TransactionAndMetadata t1;
t1.transaction = CreatePaymentTransactionObject(ACCOUNT, ACCOUNT2, 100, 3, RANGEMAX).getSerializer().peekData();
t1.metadata = CreatePaymentTransactionMetaObject(ACCOUNT, ACCOUNT2, 110, 30).getSerializer().peekData();
t1.ledgerSequence = RANGEMAX;
EXPECT_CALL(*rawBackendPtr, fetchAllTransactionsInLedger(RANGEMAX, _)).WillOnce(Return(std::vector{t1}));
EXPECT_CALL(*rawBackendPtr, fetchAllTransactionsInLedger(RANGEMAX - 1, _)).WillOnce(Return(std::vector{t1}));
runSpawn([&, this](auto yield) {
auto const handler = AnyHandler{LedgerHandler{mockBackendPtr}};
auto const req = json::parse(
R"({
"binary": false,
"expand": true,
"transactions": true
})"
);
auto output = handler.process(req, Context{.yield = yield, .apiVersion = 2u});
ASSERT_TRUE(output);
auto const req2 = json::parse(fmt::format(
R"({{
"binary": false,
"expand": true,
"transactions": true,
"ledger_index": {}
}})",
RANGEMAX - 1
));
auto output2 = handler.process(req2, Context{.yield = yield, .apiVersion = 2u});
ASSERT_TRUE(output2);
EXPECT_NE(
output->at("ledger").at("transactions").as_array()[0].at("close_time_iso"),
output2->at("ledger").at("transactions").as_array()[0].at("close_time_iso")
);
});
}
TEST_F(RPCLedgerHandlerTest, TransactionsNotExpand)
{
auto const rawBackendPtr = dynamic_cast<MockBackend*>(mockBackendPtr.get());