From ad4ba44394435ebd410ad31115d8633eeca1ae19 Mon Sep 17 00:00:00 2001 From: seelabs Date: Mon, 24 Jul 2017 16:49:11 -0400 Subject: [PATCH] Add validated field to account_channels command (RIPD-1466) --- src/ripple/rpc/handlers/AccountChannels.cpp | 10 ++++------ src/test/app/PayChan_test.cpp | 4 ++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/ripple/rpc/handlers/AccountChannels.cpp b/src/ripple/rpc/handlers/AccountChannels.cpp index 3af2b7e225..a7e3463c6d 100644 --- a/src/ripple/rpc/handlers/AccountChannels.cpp +++ b/src/ripple/rpc/handlers/AccountChannels.cpp @@ -78,9 +78,8 @@ Json::Value doAccountChannels (RPC::Context& context) std::string strIdent (params[jss::account].asString ()); AccountID accountID; - result = RPC::accountFromString (accountID, strIdent); - if (result) - return result; + if (auto const actResult = RPC::accountFromString (accountID, strIdent)) + return actResult; if (! ledger->exists(keylet::account (accountID))) return rpcError (rpcACT_NOT_FOUND); @@ -93,9 +92,8 @@ Json::Value doAccountChannels (RPC::Context& context) AccountID raDstAccount; if (hasDst) { - result = RPC::accountFromString (raDstAccount, strDst); - if (result) - return result; + if (auto const actResult = RPC::accountFromString (raDstAccount, strDst)) + return actResult; } unsigned int limit; diff --git a/src/test/app/PayChan_test.cpp b/src/test/app/PayChan_test.cpp index f2f5dfc749..dcfe4f4ce4 100644 --- a/src/test/app/PayChan_test.cpp +++ b/src/test/app/PayChan_test.cpp @@ -736,6 +736,7 @@ struct PayChan_test : public beast::unit_test::suite env.rpc ("account_channels", alice.human (), bob.human ()); BEAST_EXPECT (r[jss::result][jss::channels].size () == 1); BEAST_EXPECT (r[jss::result][jss::channels][0u][jss::channel_id] == chan1Str); + BEAST_EXPECT (r[jss::result][jss::validated]); chan1PkStr = r[jss::result][jss::channels][0u][jss::public_key].asString(); } { @@ -743,12 +744,14 @@ struct PayChan_test : public beast::unit_test::suite env.rpc ("account_channels", alice.human ()); BEAST_EXPECT (r[jss::result][jss::channels].size () == 1); BEAST_EXPECT (r[jss::result][jss::channels][0u][jss::channel_id] == chan1Str); + BEAST_EXPECT (r[jss::result][jss::validated]); chan1PkStr = r[jss::result][jss::channels][0u][jss::public_key].asString(); } { auto const r = env.rpc ("account_channels", bob.human (), alice.human ()); BEAST_EXPECT (r[jss::result][jss::channels].size () == 0); + BEAST_EXPECT (r[jss::result][jss::validated]); } env (create (alice, bob, channelFunds, settleDelay, pk)); env.close(); @@ -757,6 +760,7 @@ struct PayChan_test : public beast::unit_test::suite auto const r = env.rpc ("account_channels", alice.human (), bob.human ()); BEAST_EXPECT (r[jss::result][jss::channels].size () == 2); + BEAST_EXPECT (r[jss::result][jss::validated]); BEAST_EXPECT (chan1Str != chan2Str); for (auto const& c : {chan1Str, chan2Str}) BEAST_EXPECT (r[jss::result][jss::channels][0u][jss::channel_id] == c ||