Add JsonOptions enum class to contain options passed to getJSON methods

This commit is contained in:
Mo Morsi
2019-06-08 01:10:33 -04:00
committed by Manoj doshi
parent c2138c4e88
commit f8365f5009
77 changed files with 382 additions and 270 deletions

View File

@@ -121,24 +121,24 @@ class OwnerInfo_test : public beast::unit_test::suite
BEAST_EXPECT (
lines[0u][sfBalance.fieldName] ==
(STAmount{Issue{to_currency("CNY"), noAccount()}, 0}
.value().getJson(0)));
.value().getJson(JsonOptions::none)));
BEAST_EXPECT (
lines[0u][sfHighLimit.fieldName] ==
alice["CNY"](1000).value().getJson(0));
alice["CNY"](1000).value().getJson(JsonOptions::none));
BEAST_EXPECT (
lines[0u][sfLowLimit.fieldName] ==
gw["CNY"](0).value().getJson(0));
gw["CNY"](0).value().getJson(JsonOptions::none));
BEAST_EXPECT (
lines[1u][sfBalance.fieldName] ==
(STAmount{Issue{to_currency("USD"), noAccount()}, 0}
.value().getJson(0)));
.value().getJson(JsonOptions::none)));
BEAST_EXPECT (
lines[1u][sfHighLimit.fieldName] ==
alice["USD"](1000).value().getJson(0));
alice["USD"](1000).value().getJson(JsonOptions::none));
BEAST_EXPECT (
lines[1u][sfLowLimit.fieldName] ==
USD(0).value().getJson(0));
USD(0).value().getJson(JsonOptions::none));
if (! BEAST_EXPECT (result[jss::accepted].isMember(jss::offers)))
return;
@@ -149,9 +149,11 @@ class OwnerInfo_test : public beast::unit_test::suite
BEAST_EXPECT (
offers[0u][jss::Account] == alice.human());
BEAST_EXPECT (
offers[0u][sfTakerGets.fieldName] == XRP(1000).value().getJson(0));
offers[0u][sfTakerGets.fieldName] ==
XRP(1000).value().getJson(JsonOptions::none));
BEAST_EXPECT (
offers[0u][sfTakerPays.fieldName] == USD(1).value().getJson(0));
offers[0u][sfTakerPays.fieldName] ==
USD(1).value().getJson(JsonOptions::none));
// current ledger entry
@@ -164,24 +166,24 @@ class OwnerInfo_test : public beast::unit_test::suite
BEAST_EXPECT (
lines[0u][sfBalance.fieldName] ==
(STAmount{Issue{to_currency("CNY"), noAccount()}, -50}
.value().getJson(0)));
.value().getJson(JsonOptions::none)));
BEAST_EXPECT (
lines[0u][sfHighLimit.fieldName] ==
alice["CNY"](1000).value().getJson(0));
alice["CNY"](1000).value().getJson(JsonOptions::none));
BEAST_EXPECT (
lines[0u][sfLowLimit.fieldName] ==
gw["CNY"](0).value().getJson(0));
gw["CNY"](0).value().getJson(JsonOptions::none));
BEAST_EXPECT (
lines[1u][sfBalance.fieldName] ==
(STAmount{Issue{to_currency("USD"), noAccount()}, -50}
.value().getJson(0)));
.value().getJson(JsonOptions::none)));
BEAST_EXPECT (
lines[1u][sfHighLimit.fieldName] ==
alice["USD"](1000).value().getJson(0));
alice["USD"](1000).value().getJson(JsonOptions::none));
BEAST_EXPECT (
lines[1u][sfLowLimit.fieldName] ==
gw["USD"](0).value().getJson(0));
gw["USD"](0).value().getJson(JsonOptions::none));
if (! BEAST_EXPECT (result[jss::current].isMember(jss::offers)))
return;
@@ -195,9 +197,11 @@ class OwnerInfo_test : public beast::unit_test::suite
BEAST_EXPECT (
offers[0u][jss::Account] == alice.human());
BEAST_EXPECT (
offers[0u][sfTakerGets.fieldName] == XRP(1000).value().getJson(0));
offers[0u][sfTakerGets.fieldName] ==
XRP(1000).value().getJson(JsonOptions::none));
BEAST_EXPECT (
offers[0u][sfTakerPays.fieldName] == CNY(2).value().getJson(0));
offers[0u][sfTakerPays.fieldName] ==
CNY(2).value().getJson(JsonOptions::none));
}
public: