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

Cleanup bit tests.

Browse Source
This commit is contained in:
JoelKatz
2013-06-10 19:23:47 -07:00
parent 7643f3673c
commit ae6d06085c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cpp/ripple/Peer.cpp
View File

@@ -849,7 +849,9 @@ static void checkTransaction(Job&, int flags, SerializedTransaction::pointer stx
#endif #endif
Transaction::pointer tx; Transaction::pointer tx;
if ((flags & SF_SIGGOOD) != 0) if (isSetBit(flags, SF_SIGGOOD))
tx = boost::make_shared<Transaction>(stx, false);
else
{ {
tx = boost::make_shared<Transaction>(stx, true); tx = boost::make_shared<Transaction>(stx, true);
if (tx->getStatus() == INVALID) if (tx->getStatus() == INVALID)
@@ -861,10 +863,8 @@ static void checkTransaction(Job&, int flags, SerializedTransaction::pointer stx
else else
theApp->getSuppression().setFlag(stx->getTransactionID(), SF_SIGGOOD); theApp->getSuppression().setFlag(stx->getTransactionID(), SF_SIGGOOD);
} }
else
tx = boost::make_shared<Transaction>(stx, false);
theApp->getOPs().processTransaction(tx, (flags & SF_TRUSTED) != 0); theApp->getOPs().processTransaction(tx, isSetBit(flags, SF_TRUSTED));
#ifndef TRUST_NETWORK #ifndef TRUST_NETWORK
} }
@@ -891,13 +891,13 @@ void Peer::recvTransaction(ripple::TMTransaction& packet, ScopedLock& MasterLock
int flags; int flags;
if (!theApp->isNew(stx->getTransactionID(), mPeerId, flags)) if (!theApp->isNew(stx->getTransactionID(), mPeerId, flags))
{ // we have seen this transaction recently { // we have seen this transaction recently
if ((flags & SF_BAD) != 0) if (isSetBit(flags, SF_BAD))
{ {
punishPeer(LT_InvalidSignature); punishPeer(LT_InvalidSignature);
return; return;
} }
if ((flags & SF_RETRY) == 0) if (!isSetBit(flags, SF_RETRY))
return; return;
} }
WriteLog (lsDEBUG, Peer) << "Got new transaction from peer"; WriteLog (lsDEBUG, Peer) << "Got new transaction from peer";