From 1edc5e5ee0b5d78f026ec81618b6dbba83c480bb Mon Sep 17 00:00:00 2001 From: Nik Bougalis Date: Wed, 1 Jun 2016 14:39:26 -0700 Subject: [PATCH] Revert "Increase minimum local fee": The code is no longer necessary, as the fee is now dynamically adjusted using the new fee escalation logic. This reverts commit 57625e06ede6c851c234a3677b959f6163b06d45. --- src/ripple/app/ledger/impl/LedgerConsensusImp.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/ripple/app/ledger/impl/LedgerConsensusImp.cpp b/src/ripple/app/ledger/impl/LedgerConsensusImp.cpp index 4021f2de3..71aa656cf 100644 --- a/src/ripple/app/ledger/impl/LedgerConsensusImp.cpp +++ b/src/ripple/app/ledger/impl/LedgerConsensusImp.cpp @@ -1905,14 +1905,7 @@ void LedgerConsensusImp::addLoad(STValidation::ref val) app_.getFeeTrack().getLocalFee(), app_.getFeeTrack().getClusterFee()); - std::uint32_t loadBase = app_.getFeeTrack().getLoadBase(); - - // Hard code the minimum fee for now: - std::uint32_t const minFee = 10000; - std::uint32_t const refFee = 10; - fee = std::max(fee, (minFee * loadBase + refFee - 1) / refFee); - - if (fee > loadBase) + if (fee > app_.getFeeTrack().getLoadBase()) val->setFieldU32(sfLoadFee, fee); }