ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor AccountLinesRPC no_ripple_default logic

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ripple/app/paths/RippleState.h
View File

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

8
src/ripple/rpc/handlers/AccountLines.cpp
View File

@@ -62,10 +62,10 @@ addLine(Json::Value& jsonLines, RippleState const& line)
jPeer[jss::authorized] = true; jPeer[jss::authorized] = true;
if (line.getAuthPeer()) if (line.getAuthPeer())
jPeer[jss::peer_authorized] = true; jPeer[jss::peer_authorized] = true;
if (line.getNoRipple()) if (line.getNoRipple() || !line.getDefaultRipple())
jPeer[jss::no_ripple] = true; jPeer[jss::no_ripple] = line.getNoRipple();
if (line.getNoRipplePeer()) if (line.getNoRipplePeer() || !line.getDefaultRipple())
jPeer[jss::no_ripple_peer] = true; jPeer[jss::no_ripple_peer] = line.getNoRipplePeer();
if (line.getFreeze()) if (line.getFreeze())
jPeer[jss::freeze] = true; jPeer[jss::freeze] = true;
if (line.getFreezePeer()) if (line.getFreezePeer())

6
src/test/rpc/NoRipple_test.cpp
View File

@@ -135,12 +135,12 @@ public:
{ {
auto const aliceLines = getAccountLines(alice); auto const aliceLines = getAccountLines(alice);
BEAST_EXPECT(aliceLines.size() == 1); 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); auto const bobLines = getAccountLines(bob);
BEAST_EXPECT(bobLines.size() == 2); BEAST_EXPECT(bobLines.size() == 2);
BEAST_EXPECT(!bobLines[0u].isMember(jss::no_ripple)); BEAST_EXPECT(bobLines[0u][jss::no_ripple].asBool() == false);
BEAST_EXPECT(!bobLines[1u].isMember(jss::no_ripple)); BEAST_EXPECT(bobLines[1u][jss::no_ripple].asBool() == false);
} }
// Now carol sends the 50 USD back to alice. Then alice and // Now carol sends the 50 USD back to alice. Then alice and