ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-04-29 15:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix tests, improve code

Browse Source
This commit is contained in:
Mayukha Vadari
2026-03-24 11:54:02 -07:00
parent 8719bc19bc
commit f170f4c2c2
2 changed files with 20 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/test/rpc/Feature_test.cpp
View File

@@ -155,19 +155,10 @@ class Feature_test : public beast::unit_test::suite
BEAST_EXPECTS(
feature[jss::vetoed].asBool() == (expectVeto || expectObsolete),
feature[jss::name].asString() + " vetoed value");
if (expectObsolete)
{
BEAST_EXPECTS(
feature.isMember(jss::obsolete) && feature[jss::obsolete].isBool() &&
feature[jss::obsolete].asBool() == true,
feature[jss::name].asString() + " obsolete");
}
else
{
BEAST_EXPECTS(
!feature.isMember(jss::obsolete),
feature[jss::name].asString() + " no obsolete");
}
BEAST_EXPECTS(
feature.isMember(jss::obsolete) && feature[jss::obsolete].isBool() &&
feature[jss::obsolete].asBool() == expectObsolete,
feature[jss::name].asString() + " obsolete");
BEAST_EXPECTS(
feature.isMember(jss::supported) && feature[jss::supported].asBool(),
feature[jss::name].asString() + " supported");
@@ -299,8 +290,10 @@ class Feature_test : public beast::unit_test::suite
(*it).isMember(jss::supported) &&
(*it)[jss::supported].asBool() == expectSupported,
(*it)[jss::name].asString() + " supported");
BEAST_EXPECTS(
(*it).isMember(jss::obsolete) && (*it)[jss::obsolete].isBool(),
(*it)[jss::name].asString() + " unknown obsolete");
BEAST_EXPECT(!(*it).isMember(jss::vetoed));
BEAST_EXPECT(!(*it).isMember(jss::obsolete));
BEAST_EXPECT(!(*it).isMember(jss::majority));
BEAST_EXPECT(!(*it).isMember(jss::count));
BEAST_EXPECT(!(*it).isMember(jss::validations));
@@ -372,19 +365,10 @@ class Feature_test : public beast::unit_test::suite
BEAST_EXPECTS(
(*it)[jss::vetoed].asBool() == (expectVeto || expectObsolete),
(*it)[jss::name].asString() + " vetoed value");
if (expectObsolete)
{
BEAST_EXPECTS(
(*it).isMember(jss::obsolete) && (*it)[jss::obsolete].isBool() &&
(*it)[jss::obsolete].asBool() == true,
(*it)[jss::name].asString() + " obsolete");
}
else
{
BEAST_EXPECTS(
!(*it).isMember(jss::obsolete),
(*it)[jss::name].asString() + " no obsolete");
}
BEAST_EXPECTS(
(*it).isMember(jss::obsolete) && (*it)[jss::obsolete].isBool() &&
(*it)[jss::obsolete].asBool() == expectObsolete,
(*it)[jss::name].asString() + " obsolete");
}
BEAST_EXPECTS(
(*it).isMember(jss::supported) && (*it)[jss::supported].asBool() == expectSupported,
@@ -458,19 +442,10 @@ class Feature_test : public beast::unit_test::suite
BEAST_EXPECTS(
feature[jss::vetoed].asBool() == (expectVeto || expectObsolete),
feature[jss::name].asString() + " vetoed value");
if (expectObsolete)
{
BEAST_EXPECTS(
feature.isMember(jss::obsolete) && feature[jss::obsolete].isBool() &&
feature[jss::obsolete].asBool() == true,
feature[jss::name].asString() + " obsolete");
}
else
{
BEAST_EXPECTS(
!feature.isMember(jss::obsolete),
feature[jss::name].asString() + " no obsolete");
}
BEAST_EXPECTS(
feature.isMember(jss::obsolete) && feature[jss::obsolete].isBool() &&
feature[jss::obsolete].asBool() == expectObsolete,
feature[jss::name].asString() + " obsolete");
BEAST_EXPECTS(feature.isMember(jss::count), feature[jss::name].asString() + " count");
BEAST_EXPECTS(
feature.isMember(jss::threshold), feature[jss::name].asString() + " threshold");

15
src/xrpld/app/misc/detail/AmendmentTable.cpp
View File

@@ -924,17 +924,12 @@ AmendmentTableImpl::injectJson(
v[jss::name] = fs.name;
v[jss::supported] = fs.supported;
if (fs.vote == AmendmentVote::obsolete)
{
v[jss::obsolete] = true;
if (isAdmin)
v[jss::vetoed] = true;
}
else if (isAdmin)
{
v[jss::vetoed] = fs.vote == AmendmentVote::down;
}
v[jss::enabled] = fs.enabled;
v[jss::obsolete] = fs.vote == AmendmentVote::obsolete;
if (isAdmin)
{
v[jss::vetoed] = fs.vote == AmendmentVote::down || fs.vote == AmendmentVote::obsolete;
}
if (!fs.enabled && lastVote_ && isAdmin)
{