[FOLD] Initialize account_objects as json array

XRPLF · Jan 29, 2018 · 8cff40e · 8cff40e
1 parent aa2046f
commit 8cff40e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/src/ripple/rpc/impl/RPCHelpers.cpp b/src/ripple/rpc/impl/RPCHelpers.cpp
@@ -97,7 +97,7 @@ getAccountObjects(ReadView const& ledger, AccountID const& account,
         return false;
 
     std::uint32_t i = 0;
-    auto& jvObjects = jvResult[jss::account_objects];
+    auto& jvObjects = (jvResult[jss::account_objects] = Json::arrayValue);
     for (;;)
     {
         auto const& entries = dir->getFieldV256 (sfIndexes);

diff --git a/src/test/rpc/AccountObjects_test.cpp b/src/test/rpc/AccountObjects_test.cpp
@@ -512,22 +512,12 @@ class AccountObjects_test : public beast::unit_test::suite
             env.close();
         }
 
-        // Make a lambda that easily identifies null account objects.
-        auto acct_objs_is_null =
-            [&env, &acct_objs] (Account const& acct, char const* type)
-        {
-            Json::Value const resp = acct_objs (acct, type);
-            return resp["result"]["account_objects"].isNull();
-        };
-
         // Verify that the non-returning types still don't return anything.
-        // Note that, interestingly, they now return a null object rather
-        // than an empty array.  Not sure what triggers that...
-        BEAST_EXPECT (acct_objs_is_null (gw, jss::account));
-        BEAST_EXPECT (acct_objs_is_null (gw, jss::amendments));
-        BEAST_EXPECT (acct_objs_is_null (gw, jss::directory));
-        BEAST_EXPECT (acct_objs_is_null (gw, jss::fee));
-        BEAST_EXPECT (acct_objs_is_null (gw, jss::hashes));
+        BEAST_EXPECT (acct_objs_is_empty (gw, jss::account));
+        BEAST_EXPECT (acct_objs_is_empty (gw, jss::amendments));
+        BEAST_EXPECT (acct_objs_is_empty (gw, jss::directory));
+        BEAST_EXPECT (acct_objs_is_empty (gw, jss::fee));
+        BEAST_EXPECT (acct_objs_is_empty (gw, jss::hashes));
     }
 
     void run() override