From 4a35222fca0eac0916d5993cf3989f31d470dbbd Mon Sep 17 00:00:00 2001
From: Nathan Nichols <natenichols@cox.net>
Date: Tue, 18 May 2021 12:18:19 -0500
Subject: [PATCH] rebase

---
 handlers/RPCHelpers.cpp | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/handlers/RPCHelpers.cpp b/handlers/RPCHelpers.cpp
index dd09b492b..8a2a05778 100644
--- a/handlers/RPCHelpers.cpp
+++ b/handlers/RPCHelpers.cpp
@@ -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)
 {