ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

6
src/ripple/app/misc/TxQ.h
View File

@@ -320,8 +320,7 @@ public:
FeeEscalation amendment is not enabled.
*/
boost::optional<Metrics>
getMetrics(OpenView const& view,
std::uint32_t txCountPadding = 0) const;
getMetrics(OpenView const& view) const;
/** Returns information about the transactions currently
in the queue for the account.
@@ -452,8 +451,7 @@ private:
*/
static
std::uint64_t
scaleFeeLevel(Snapshot const& snapshot, OpenView const& view,
std::uint32_t txCountPadding = 0);
scaleFeeLevel(Snapshot const& snapshot, OpenView const& view);
/**
Computes the total fee level for all transactions in a series.

9
src/ripple/app/misc/impl/TxQ.cpp
View File

@@ -164,10 +164,10 @@ TxQ::FeeMetrics::update(Application& app,
std::uint64_t
TxQ::FeeMetrics::scaleFeeLevel(Snapshot const& snapshot,
OpenView const& view, std::uint32_t txCountPadding)
OpenView const& view)
{
// Transactions in the open ledger so far
auto const current = view.txCount() + txCountPadding;
auto const current = view.txCount();
auto const target = snapshot.txnsExpected;
auto const multiplier = snapshot.escalationMultiplier;
@@ -1375,7 +1375,7 @@ TxQ::accept(Application& app,
}
auto
TxQ::getMetrics(OpenView const& view, std::uint32_t txCountPadding) const
TxQ::getMetrics(OpenView const& view) const
-> boost::optional<Metrics>
{
auto const allowEscalation =
@@ -1397,8 +1397,7 @@ TxQ::getMetrics(OpenView const& view, std::uint32_t txCountPadding) const
result.minProcessingFeeLevel = isFull() ? byFee_.rbegin()->feeLevel + 1 :
baseLevel;
result.medFeeLevel = snapshot.escalationMultiplier;
result.openLedgerFeeLevel = FeeMetrics::scaleFeeLevel(snapshot, view,
txCountPadding);
result.openLedgerFeeLevel = FeeMetrics::scaleFeeLevel(snapshot, view);
return result;
}