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 'pay'

Browse Source 
Conflicts:
	src/NetworkOPs.cpp
This commit is contained in:
Arthur Britto
2012-05-27 17:56:45 -07:00
parent 64f903f21d d5e918e85b
commit eab7a2d93a
10 changed files with 236 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/NetworkOPs.cpp
View File

@@ -107,7 +107,7 @@ Transaction::pointer NetworkOPs::processTransaction(Transaction::pointer trans,
#ifdef DEBUG
std::cerr << "Status other than success " << r << std::endl;
#endif
trans->setStatus(INVALID);
return trans;
}
@@ -125,7 +125,7 @@ int NetworkOPs::findTransactionsBySource(std::list<Transaction::pointer>& txns,
if (minSeq > state->getSeq()) return 0;
if (maxSeq > state->getSeq()) maxSeq = state->getSeq();
if (maxSeq > minSeq) return 0;
int count = 0;
for(int i = minSeq; i <= maxSeq; ++i)
{
@@ -439,4 +439,6 @@ void NetworkOPs::mapComplete(const uint256& hash, SHAMap::pointer map)
{
if (mConsensus)
mConsensus->mapComplete(hash, map);
}
}
// vim:ts=4