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

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

Browse Source
This commit is contained in:
JoelKatz
2012-08-29 14:40:00 -07:00
parent 5db8082608 dacc4a7286
commit ed709e0ccc
7 changed files with 287 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/LedgerConsensus.cpp
View File

@@ -534,6 +534,7 @@ void LedgerConsensus::updateOurPositions()
}
std::map<uint32, int> closeTimes;
BOOST_FOREACH(u160_prop_pair& it, mPeerPositions)
++closeTimes[it.second->getCloseTime() - (it.second->getCloseTime() % mCloseResolution)];
@@ -803,7 +804,7 @@ void LedgerConsensus::applyTransaction(TransactionEngine& engine, const Serializ
try
{
#endif
TransactionEngineResult result = engine.applyTransaction(*txn, parms);
TER result = engine.applyTransaction(*txn, parms);
if (result > 0)
{
Log(lsINFO) << " retry";
@@ -865,7 +866,7 @@ void LedgerConsensus::applyTransactions(const SHAMap::pointer& set, const Ledger
{
try
{
TransactionEngineResult result = engine.applyTransaction(*it->second, parms);
TER result = engine.applyTransaction(*it->second, parms);
if (result <= 0)
{
if (result == 0) ++successes;