From 8116b569c7235fc83d61b68f5b3c697b8042df35 Mon Sep 17 00:00:00 2001 From: Nathan Nichols Date: Mon, 17 Aug 2020 22:20:53 -0500 Subject: [PATCH] Refactor AccountLinesRPC no_ripple_default logic --- src/ripple/app/paths/RippleState.h | 6 ++++++ src/ripple/rpc/handlers/AccountLines.cpp | 8 ++++---- src/test/rpc/NoRipple_test.cpp | 6 +++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/ripple/app/paths/RippleState.h b/src/ripple/app/paths/RippleState.h index 96b4fd254..ccefb2194 100644 --- a/src/ripple/app/paths/RippleState.h +++ b/src/ripple/app/paths/RippleState.h @@ -87,6 +87,12 @@ public: return mFlags & (!mViewLowest ? lsfLowAuth : lsfHighAuth); } + bool + getDefaultRipple() const + { + return mFlags & lsfDefaultRipple; + } + bool getNoRipple() const { diff --git a/src/ripple/rpc/handlers/AccountLines.cpp b/src/ripple/rpc/handlers/AccountLines.cpp index d8369bcf6..947b0a3be 100644 --- a/src/ripple/rpc/handlers/AccountLines.cpp +++ b/src/ripple/rpc/handlers/AccountLines.cpp @@ -62,10 +62,10 @@ addLine(Json::Value& jsonLines, RippleState const& line) jPeer[jss::authorized] = true; if (line.getAuthPeer()) jPeer[jss::peer_authorized] = true; - if (line.getNoRipple()) - jPeer[jss::no_ripple] = true; - if (line.getNoRipplePeer()) - jPeer[jss::no_ripple_peer] = true; + if (line.getNoRipple() || !line.getDefaultRipple()) + jPeer[jss::no_ripple] = line.getNoRipple(); + if (line.getNoRipplePeer() || !line.getDefaultRipple()) + jPeer[jss::no_ripple_peer] = line.getNoRipplePeer(); if (line.getFreeze()) jPeer[jss::freeze] = true; if (line.getFreezePeer()) diff --git a/src/test/rpc/NoRipple_test.cpp b/src/test/rpc/NoRipple_test.cpp index ef662660d..69c88d144 100644 --- a/src/test/rpc/NoRipple_test.cpp +++ b/src/test/rpc/NoRipple_test.cpp @@ -135,12 +135,12 @@ public: { auto const aliceLines = getAccountLines(alice); BEAST_EXPECT(aliceLines.size() == 1); - BEAST_EXPECT(!aliceLines[0u].isMember(jss::no_ripple)); + BEAST_EXPECT(aliceLines[0u][jss::no_ripple].asBool() == false); auto const bobLines = getAccountLines(bob); BEAST_EXPECT(bobLines.size() == 2); - BEAST_EXPECT(!bobLines[0u].isMember(jss::no_ripple)); - BEAST_EXPECT(!bobLines[1u].isMember(jss::no_ripple)); + BEAST_EXPECT(bobLines[0u][jss::no_ripple].asBool() == false); + BEAST_EXPECT(bobLines[1u][jss::no_ripple].asBool() == false); } // Now carol sends the 50 USD back to alice. Then alice and