From 832cc78da5a97abdace980e0af125b9c9fcc7bfc Mon Sep 17 00:00:00 2001 From: Brad Chase Date: Mon, 23 Oct 2017 10:25:26 -0400 Subject: [PATCH] [FOLD] Address PR comments --- src/ripple/app/misc/impl/ValidatorList.cpp | 9 ++++++--- src/test/rpc/ValidatorRPC_test.cpp | 7 +++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/ripple/app/misc/impl/ValidatorList.cpp b/src/ripple/app/misc/impl/ValidatorList.cpp index 247bfc65d84..6fde55fa9c0 100644 --- a/src/ripple/app/misc/impl/ValidatorList.cpp +++ b/src/ripple/app/misc/impl/ValidatorList.cpp @@ -487,10 +487,13 @@ ValidatorList::getJson() const continue; Json::Value& curr = jPublisherLists.append(Json::objectValue); curr[jss::pubkey_publisher] = strHex(p.first); - curr[jss::seq] = static_cast(p.second.sequence); curr[jss::available] = p.second.available; - curr[jss::expiration] = to_string(p.second.expiration); - curr[jss::version] = requiredListVersion; + if(p.second.expiration != TimeKeeper::time_point{}) + { + curr[jss::seq] = static_cast(p.second.sequence); + curr[jss::expiration] = to_string(p.second.expiration); + curr[jss::version] = requiredListVersion; + } Json::Value& keys = (curr[jss::list] = Json::arrayValue); for (auto const& key : p.second.list) { diff --git a/src/test/rpc/ValidatorRPC_test.cpp b/src/test/rpc/ValidatorRPC_test.cpp index 79cef240659..84c01274b1b 100644 --- a/src/test/rpc/ValidatorRPC_test.cpp +++ b/src/test/rpc/ValidatorRPC_test.cpp @@ -233,12 +233,11 @@ class ValidatorRPC_test : public beast::unit_test::suite auto jp = jrr[jss::publisher_lists][0u]; BEAST_EXPECT(jp[jss::available] == false); BEAST_EXPECT(jp[jss::list].size() == 0); - BEAST_EXPECT(jp[jss::seq].asUInt() == 0); + BEAST_EXPECT(!jp.isMember(jss::seq)); + BEAST_EXPECT(!jp.isMember(jss::expiration)); + BEAST_EXPECT(!jp.isMember(jss::version)); BEAST_EXPECT( jp[jss::pubkey_publisher] == strHex(publisherPublic)); - BEAST_EXPECT(jp[jss::expiration] == - to_string(TimeKeeper::time_point{})); - BEAST_EXPECT(jp[jss::version] == 1); } } {