From 0d8ad928f618d8a3298e91fa8ac58522942ca3a8 Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Mon, 27 Aug 2012 13:20:47 -0700 Subject: [PATCH] Simplify clean up for takeOffers. --- src/TransactionEngine.cpp | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/src/TransactionEngine.cpp b/src/TransactionEngine.cpp index 7cf1460c99..694892fae0 100644 --- a/src/TransactionEngine.cpp +++ b/src/TransactionEngine.cpp @@ -4184,24 +4184,14 @@ TransactionEngineResult TransactionEngine::takeOffers( } // On storing meta data, delete offers that were found unfunded to prevent encountering them in future. - switch (terResult) + if (tesSUCCESS == terResult) { - case tesSUCCESS: - case tepPATH_DRY: - case tepPATH_PARTIAL: - BOOST_FOREACH(const uint256& uOfferIndex, usOfferUnfundedFound) - { - TransactionEngineResult terDelete = offerDelete(uOfferIndex); - - if (tesSUCCESS != terDelete) - terResult = terDelete; - break; - } - break; - - default: - nothing(); - break; + BOOST_FOREACH(const uint256& uOfferIndex, usOfferUnfundedFound) + { + terResult = offerDelete(uOfferIndex); + if (tesSUCCESS != terResult) + break; + } } if (tesSUCCESS == terResult) @@ -4209,10 +4199,8 @@ TransactionEngineResult TransactionEngine::takeOffers( // On success, delete offers that became unfunded. BOOST_FOREACH(const uint256& uOfferIndex, usOfferUnfundedBecame) { - TransactionEngineResult terDelete = offerDelete(uOfferIndex); - - if (tesSUCCESS != terDelete) - terResult = terDelete; + terResult = offerDelete(uOfferIndex); + if (tesSUCCESS != terResult) break; } }