Cleanup bit tests.

This commit is contained in:
JoelKatz
2013-06-10 19:23:47 -07:00
parent cf848be444
commit f0cf90ab24

View File

@@ -983,7 +983,9 @@ static void checkTransaction(Job&, int flags, SerializedTransaction::pointer stx
#endif
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);
if (tx->getStatus() == INVALID)
@@ -995,10 +997,8 @@ static void checkTransaction(Job&, int flags, SerializedTransaction::pointer stx
else
theApp->getHashRouter().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
}
@@ -1025,13 +1025,13 @@ void PeerImp::recvTransaction(ripple::TMTransaction& packet, ScopedLock& MasterL
int flags;
if (! theApp->getHashRouter ().addSuppressionPeer (stx->getTransactionID(), mPeerId, flags))
{ // we have seen this transaction recently
if ((flags & SF_BAD) != 0)
if (isSetBit(flags, SF_BAD))
{
punishPeer(LT_InvalidSignature);
return;
}
if ((flags & SF_RETRY) == 0)
if (!isSetBit(flags, SF_RETRY))
return;
}
WriteLog (lsDEBUG, Peer) << "Got new transaction from peer";