Refactor AccountLinesRPC no_ripple_default logic

This commit is contained in:
Nathan Nichols
2020-08-17 22:20:53 -05:00
committed by Nik Bougalis
parent 2bba79138f
commit 8116b569c7
3 changed files with 13 additions and 7 deletions

View File

@@ -87,6 +87,12 @@ public:
return mFlags & (!mViewLowest ? lsfLowAuth : lsfHighAuth);
}
bool
getDefaultRipple() const
{
return mFlags & lsfDefaultRipple;
}
bool
getNoRipple() const
{

View File

@@ -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())

View File

@@ -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