From b22a0f4a97635106dcf09a772e607aee0035ec79 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Tue, 11 Mar 2014 01:11:45 -0700 Subject: [PATCH] Ensure offer cleanup is deterministic --- src/ripple_app/tx/OfferCreateTransactor.cpp | 9 ++------- src/ripple_app/tx/OfferCreateTransactor.h | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/ripple_app/tx/OfferCreateTransactor.cpp b/src/ripple_app/tx/OfferCreateTransactor.cpp index d15bdd61fa..a62de18df2 100644 --- a/src/ripple_app/tx/OfferCreateTransactor.cpp +++ b/src/ripple_app/tx/OfferCreateTransactor.cpp @@ -360,10 +360,7 @@ TER OfferCreateTransactor::takeOffers ( { WriteLog (lsDEBUG, OfferCreateTransactor) << "takeOffers: became unfunded: " << uOfferIndex.ToString (); - terResult = lesActive.offerDelete (uOfferIndex); - - if (tesSUCCESS != terResult) - break; + lesActive.offerDelete (uOfferIndex); } } @@ -709,10 +706,8 @@ TER OfferCreateTransactor::doApply () WriteLog (lsINFO, OfferCreateTransactor) << "takeOffers: found unfunded: " << uOfferIndex.ToString (); - terResult = lesActive.offerDelete (uOfferIndex); + lesActive.offerDelete (uOfferIndex); - if (tesSUCCESS != terResult) - break; } // Go through the list of offers not found and remove them from the order book diff --git a/src/ripple_app/tx/OfferCreateTransactor.h b/src/ripple_app/tx/OfferCreateTransactor.h index ec418c35e6..1225ac4599 100644 --- a/src/ripple_app/tx/OfferCreateTransactor.h +++ b/src/ripple_app/tx/OfferCreateTransactor.h @@ -54,7 +54,7 @@ private: boost::unordered_set usOfferUnfundedFound; // Offers found unfunded. typedef std::pair missingOffer_t; - boost::unordered_set usMissingOffers; + std::set usMissingOffers; }; #endif