ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source
This commit is contained in:
Arthur Britto
2013-02-12 16:05:15 -08:00
parent 7e271ce509 8a4820cf34
commit e5b75c66a1
5 changed files with 179 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpp/ripple/LoadManager.cpp
View File

@@ -247,8 +247,8 @@ bool LoadFeeTrack::raiseLocalFee()
boost::mutex::scoped_lock sl(mLock);
uint32 origFee = mLocalTxnLoadFee;
if (mLocalTxnLoadFee < mLocalTxnLoadFee) // make sure this fee takes effect
mLocalTxnLoadFee = mLocalTxnLoadFee;
if (mLocalTxnLoadFee < mRemoteTxnLoadFee) // make sure this fee takes effect
mLocalTxnLoadFee = mRemoteTxnLoadFee;
mLocalTxnLoadFee += (mLocalTxnLoadFee / lftFeeIncFraction); // increment by 1/16th

2
src/cpp/ripple/NetworkOPs.cpp
View File

@@ -1163,7 +1163,7 @@ Json::Value NetworkOPs::getServerInfo(bool human, bool admin)
}
else
info["load_factor"] =
static_cast<double>(theApp->getFeeTrack().getLoadBase()) / theApp->getFeeTrack().getLoadFactor();
static_cast<double>(theApp->getFeeTrack().getLoadFactor()) / theApp->getFeeTrack().getLoadBase();
bool valid = false;
Ledger::pointer lpClosed = getValidatedLedger();