Remove undocumented experimental options from RPC sign (RIPD-1653):

The `x_assume_tx` and `x_queue_okay` experimental options were
associated with the transaction queue that were not officially
supported.
This commit is contained in:
Edward Hennis
2018-10-15 18:43:04 -04:00
committed by Nik Bougalis
parent c587012e5c
commit a96cb8fc1c
5 changed files with 86 additions and 137 deletions

View File

@@ -699,10 +699,7 @@ Json::Value checkFee (
ledger->fees(), isUnlimited (role));
std::uint64_t fee = loadFee;
{
auto const assumeTx = request.isMember("x_assume_tx") &&
request["x_assume_tx"].isConvertibleTo(Json::uintValue) ?
request["x_assume_tx"].asUInt() : 0;
auto const metrics = txQ.getMetrics(*ledger, assumeTx);
auto const metrics = txQ.getMetrics(*ledger);
if(metrics)
{
auto const baseFee = ledger->fees().base;
@@ -729,13 +726,6 @@ Json::Value checkFee (
return result.second;
}();
if (fee > limit && fee != loadFee &&
request.isMember("x_queue_okay") &&
request["x_queue_okay"].isBool() &&
request["x_queue_okay"].asBool())
{
fee = std::max(loadFee, limit);
}
if (fee > limit)
{
std::stringstream ss;