From af167031c94efa5851950f5f7ca136a6f008af71 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Mon, 10 Jun 2013 19:29:24 -0700 Subject: [PATCH] Clean this up a bit more. Conflicts: src/cpp/ripple/ripple_Peer.cpp --- src/cpp/ripple/ripple_Peer.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/cpp/ripple/ripple_Peer.cpp b/src/cpp/ripple/ripple_Peer.cpp index 850de7b28..375e1f9f0 100644 --- a/src/cpp/ripple/ripple_Peer.cpp +++ b/src/cpp/ripple/ripple_Peer.cpp @@ -986,17 +986,16 @@ static void checkTransaction(Job&, int flags, SerializedTransaction::pointer stx if (isSetBit(flags, SF_SIGGOOD)) tx = boost::make_shared(stx, false); else - { tx = boost::make_shared(stx, true); - if (tx->getStatus() == INVALID) - { - theApp->getHashRouter().setFlag(stx->getTransactionID(), SF_BAD); - Peer::punishPeer(peer, LT_InvalidSignature); - return; - } - else - theApp->getHashRouter().setFlag(stx->getTransactionID(), SF_SIGGOOD); + + if (tx->getStatus() == INVALID) + { + theApp->getHashRouter().setFlag(stx->getTransactionID(), SF_BAD); + Peer::punishPeer(peer, LT_InvalidSignature); + return; } + else + theApp->getHashRouter().setFlag(stx->getTransactionID(), SF_SIGGOOD); theApp->getOPs().processTransaction(tx, isSetBit(flags, SF_TRUSTED));