ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2026-04-29 15:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

rebase

Browse Source
This commit is contained in:
Nathan Nichols
2021-05-18 12:18:19 -05:00
parent 8d5bb85458
commit 4a35222fca
1 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
handlers/RPCHelpers.cpp
View File

@@ -57,6 +57,7 @@ std::pair<
std::shared_ptr<ripple::TxMeta const>>
deserializeTxPlusMeta(Backend::TransactionAndMetadata const& blobs, std::uint32_t seq)
{
<<<<<<< HEAD
auto [tx, meta] = deserializeTxPlusMeta(blobs);
std::shared_ptr<ripple::TxMeta> m =
@@ -66,6 +67,27 @@ deserializeTxPlusMeta(Backend::TransactionAndMetadata const& blobs, std::uint32_
*meta);
return {tx, m};
=======
std::pair<
std::shared_ptr<ripple::STTx const>,
std::shared_ptr<ripple::TxMeta const>>
result;
{
ripple::SerialIter s{
blobs.transaction.data(), blobs.transaction.size()};
result.first = std::make_shared<ripple::STTx const>(s);
}
{
// ripple::Blob{blobs.metadata.data(), blobs.metadata.size()};
result.second =
std::make_shared<ripple::TxMeta const>(
result.first->getTransactionID(),
seq,
blobs.metadata);
}
return result;
>>>>>>> 5f429d4 (adds account subscription)
}
boost::json::object
@@ -81,6 +103,19 @@ getJson(ripple::STBase const& obj)
return value.as_object();
}
boost::json::object
getJson(ripple::TxMeta const& meta)
{
auto start = std::chrono::system_clock::now();
boost::json::value value = boost::json::parse(
meta.getJson(ripple::JsonOptions::none).toStyledString());
auto end = std::chrono::system_clock::now();
value.as_object()["deserialization_time_microseconds"] =
std::chrono::duration_cast<std::chrono::microseconds>(end - start)
.count();
return value.as_object();
}
boost::json::value
getJson(Json::Value const& value)
{