Move change to API version 3

XRPLF · Nov 20, 2023 · 4548a30 · 4548a30
1 parent c0b9bba
commit 4548a30
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/ripple/app/ledger/impl/LedgerToJson.cpp b/src/ripple/app/ledger/impl/LedgerToJson.cpp
@@ -61,7 +61,7 @@ fillJson(
     unsigned apiVersion)
 {
     json[jss::parent_hash] = to_string(info.parentHash);
-    json[jss::ledger_index] = (apiVersion > 1)
+    json[jss::ledger_index] = (apiVersion > 2)
         ? Json::Value(info.seq)
         : Json::Value(std::to_string(info.seq));
 
@@ -168,7 +168,7 @@ fillJsonTx(
         if (validated)
         {
             auto const seq = fill.ledger.seq();
-            txJson[jss::ledger_index] = (fill.context->apiVersion > 1)
+            txJson[jss::ledger_index] = (fill.context->apiVersion > 2)
                 ? Json::Value(seq)
                 : Json::Value(std::to_string(seq));
             if (fill.closeTime)

diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp
@@ -2222,16 +2222,17 @@ NetworkOPsImp::pubValidation(std::shared_ptr<STValidation> const& val)
 
         // TODO Replace multiObj with jvObj when API versions 1 & 2 are retired
         MultiApiJson multiObj = {{jvObj, jvObj, jvObj}};
-        constexpr std::size_t indexApi1 = apiVersionSelector(1)();
-        // TODO also version 2
-        static_assert(indexApi1 == 0);
-        auto& jvObjApi1 = multiObj.val[indexApi1];
-        if (jvObjApi1.isMember(jss::ledger_index))
-        {
-            // Cast back to API version 1 type of this field, i.e. string
-            jvObjApi1[jss::ledger_index] =
-                std::to_string(jvObjApi1[jss::ledger_index].asUInt());
-        }
+        visit<RPC::apiMinimumSupportedVersion, RPC::apiMaximumValidVersion>(
+            multiObj,  //
+            [](Json::Value& jvTx, unsigned int apiVersion) {
+                // Type conversion for older API versions to string
+                if (jvTx.isMember(jss::ledger_index) && apiVersion < 3)
+                {
+                    jvTx[jss::ledger_index] =
+                        std::to_string(jvTx[jss::ledger_index].asUInt());
+                }
+            });
+
         for (auto i = mStreamMaps[sValidations].begin();
              i != mStreamMaps[sValidations].end();)
         {