Minor fixes

Author: mathbunnyru

src/rpc/handlers/VaultList.cpp

@@ -39,13 +39,16 @@
 #include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/LedgerHeader.h>
 #include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STBase.h>
 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol/Serializer.h>
 #include <xrpl/protocol/jss.h>
 
 #include <cstdint>
+#include <memory>
 #include <optional>
 #include <string>
+#include <utility>
 
 namespace rpc {
 
@@ -109,7 +112,7 @@ VaultListHandler::process(VaultListHandler::Input const& input, Context const& c
 
         auto vaultSle = std::move(sle);
 
-        summary["vault_id"] = ripple::strHex(vaultSle.key());
+        summary[JS(vault_id)] = ripple::strHex(vaultSle.key());
         summary[JS(account)] = ripple::toBase58(vaultSle.getAccountID(ripple::sfAccount));
         summary[JS(owner)] = ripple::toBase58(vaultSle.getAccountID(ripple::sfOwner));
 
@@ -122,26 +125,24 @@ VaultListHandler::process(VaultListHandler::Input const& input, Context const& c
         }
 
         // Fetch the share MPT issuance to get total_shares (OutstandingAmount)
-        auto const shareMPTID = vaultSle[ripple::sfShareMPTID];
-        auto const shareIssuanceKey = ripple::keylet::mptIssuance(shareMPTID).key;
+        auto const issuanceKeylet = ripple::keylet::mptIssuance(vaultSle[ripple::sfShareMPTID]).key;
         auto const shareIssuanceObject =
-            sharedPtrBackend_->fetchLedgerObject(shareIssuanceKey, lgrInfo.seq, ctx.yield);
+            sharedPtrBackend_->fetchLedgerObject(issuanceKeylet, lgrInfo.seq, ctx.yield);
 
         if (shareIssuanceObject) {
             ripple::STLedgerEntry const shareSle{
                 ripple::SerialIter{shareIssuanceObject->data(), shareIssuanceObject->size()},
-                shareIssuanceKey
+                issuanceKeylet
             };
-            summary["total_shares"] =
-                std::to_string(shareSle.getFieldU64(ripple::sfOutstandingAmount));
+            summary["total_shares"] = shareSle.getFieldU64(ripple::sfOutstandingAmount);
         } else {
-            summary["total_shares"] = "0";
+            summary["total_shares"] = std::uint64_t{0};
         }
 
         // Status derived from flags
         auto const flags = vaultSle.getFlags();
         // A vault with no special flags set is considered active
-        summary["status"] = (flags == 0) ? "active" : "modified";
+        summary[JS(status)] = (flags == 0) ? "active" : "modified";
         summary[JS(flags)] = flags;
 
         response.vaults.push_back(summary);

tests/unit/rpc/handlers/VaultListTests.cpp

@@ -378,7 +378,7 @@ TEST_F(RPCVaultListHandlerTest, SingleVaultListed)
         EXPECT_EQ(vaultSummary.at("account").as_string(), kACCOUNT2);
         EXPECT_EQ(vaultSummary.at("owner").as_string(), kACCOUNT);
         EXPECT_TRUE(vaultSummary.contains("total_assets"));
-        EXPECT_EQ(vaultSummary.at("total_shares").as_string(), "1000");
+        EXPECT_EQ(vaultSummary.at("total_shares").as_uint64(), 1000);
         EXPECT_EQ(vaultSummary.at("status").as_string(), "active");
         EXPECT_EQ(vaultSummary.at("flags").as_uint64(), 0);
     });
@@ -526,8 +526,8 @@ TEST_F(RPCVaultListHandlerTest, MultipleVaultsListed)
             EXPECT_TRUE(obj.contains("flags"));
         }
 
-        EXPECT_EQ(vaults[0].as_object().at("total_shares").as_string(), "100");
-        EXPECT_EQ(vaults[1].as_object().at("total_shares").as_string(), "200");
+        EXPECT_EQ(vaults[0].as_object().at("total_shares").as_uint64(), 100);
+        EXPECT_EQ(vaults[1].as_object().at("total_shares").as_uint64(), 200);
     });
 }
 
@@ -597,7 +597,7 @@ TEST_F(RPCVaultListHandlerTest, ShareIssuanceNotFoundFallsBackToZero)
 
         auto const& vaults = output.result->as_object().at("vaults").as_array();
         ASSERT_EQ(vaults.size(), 1);
-        EXPECT_EQ(vaults[0].as_object().at("total_shares").as_string(), "0");
+        EXPECT_EQ(vaults[0].as_object().at("total_shares").as_uint64(), 0);
     });
 }