WIP: Factor out multivariate Json

XRPLF · Oct 5, 2023 · 4d9a594 · 4d9a594
1 parent 3530697
commit 4d9a594
Show file tree

Hide file tree

Showing 6 changed files with 176 additions and 123 deletions.
diff --git a/src/ripple/app/ledger/BookListeners.cpp b/src/ripple/app/ledger/BookListeners.cpp
@@ -39,8 +39,7 @@ BookListeners::removeSubscriber(std::uint64_t seq)
 
 void
 BookListeners::publish(
-    Json::Value const& jvObj,
-    Json::Value const& jvObjApiVer2,
+    MultiApiJson const& jvObj,
     hash_set<std::uint64_t>& havePublished)
 {
     std::lock_guard sl(mLock);
@@ -55,10 +54,8 @@ BookListeners::publish(
             // Only publish jvObj if this is the first occurence
             if (havePublished.emplace(p->getSeq()).second)
             {
-                if (p->getApiVersion() == 1)
-                    p->send(jvObj, true);
-                else
-                    p->send(jvObjApiVer2, true);
+                p->send(
+                    jvObj.select(apiVersionSelector(p->getApiVersion())), true);
             }
             ++it;
         }

diff --git a/src/ripple/app/ledger/BookListeners.h b/src/ripple/app/ledger/BookListeners.h
@@ -20,7 +20,9 @@
 #ifndef RIPPLE_APP_LEDGER_BOOKLISTENERS_H_INCLUDED
 #define RIPPLE_APP_LEDGER_BOOKLISTENERS_H_INCLUDED
 
+#include <ripple/basics/MultivarJson.h>
 #include <ripple/net/InfoSub.h>
+
 #include <memory>
 #include <mutex>
 
@@ -58,7 +60,7 @@ class BookListeners
 
     */
     void
-    publish(Json::Value const& jvObj, Json::Value const& jvObjApiVer2, hash_set<std::uint64_t>& havePublished);
+    publish(MultiApiJson const& jvObj, hash_set<std::uint64_t>& havePublished);
 
 private:
     std::recursive_mutex mLock;

diff --git a/src/ripple/app/ledger/OrderBookDB.cpp b/src/ripple/app/ledger/OrderBookDB.cpp
@@ -250,8 +250,7 @@ void
 OrderBookDB::processTxn(
     std::shared_ptr<ReadView const> const& ledger,
     const AcceptedLedgerTx& alTx,
-    Json::Value const& jvObj,
-    Json::Value const& jvObjApiVer2)
+    MultiApiJson const& jvObj)
 {
     std::lock_guard sl(mLock);
 
@@ -278,7 +277,7 @@ OrderBookDB::processTxn(
                             {data->getFieldAmount(sfTakerGets).issue(),
                              data->getFieldAmount(sfTakerPays).issue()});
                         if (listeners)
-                            listeners->publish(jvObj, jvObjApiVer2, havePublished);
+                            listeners->publish(jvObj, havePublished);
                     }
                 };
 

diff --git a/src/ripple/app/ledger/OrderBookDB.h b/src/ripple/app/ledger/OrderBookDB.h
@@ -23,6 +23,8 @@
 #include <ripple/app/ledger/AcceptedLedgerTx.h>
 #include <ripple/app/ledger/BookListeners.h>
 #include <ripple/app/main/Application.h>
+#include <ripple/basics/MultivarJson.h>
+
 #include <mutex>
 
 namespace ripple {
@@ -63,8 +65,7 @@ class OrderBookDB
     processTxn(
         std::shared_ptr<ReadView const> const& ledger,
         const AcceptedLedgerTx& alTx,
-        Json::Value const& jvObj,
-        Json::Value const& jvObjApiVer2);
+        MultiApiJson const& jvObj);
 
 private:
     Application& app_;