From 0bc4a7b1e2028965bab295ae157796e56893663e Mon Sep 17 00:00:00 2001
From: Arthur Britto <ahbritto@gmail.com>
Date: Sat, 15 Dec 2012 16:48:46 -0800
Subject: [PATCH] Fix extraneous offer creation.

---
 src/cpp/ripple/LedgerEntrySet.cpp        |  2 ++
 src/cpp/ripple/OfferCreateTransactor.cpp | 12 ++++++++++--
 src/cpp/ripple/TransactionEngine.cpp     |  1 +
 src/cpp/ripple/TransactionErr.cpp        |  1 +
 test/offer-test.js                       |  2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/cpp/ripple/LedgerEntrySet.cpp b/src/cpp/ripple/LedgerEntrySet.cpp
index 0c1ed7119a..0d335848ae 100644
--- a/src/cpp/ripple/LedgerEntrySet.cpp
+++ b/src/cpp/ripple/LedgerEntrySet.cpp
@@ -7,6 +7,7 @@
 #include "Log.h"
 
 SETUP_LOG();
+
 DECLARE_INSTANCE(LedgerEntrySetEntry);
 DECLARE_INSTANCE(LedgerEntrySet)
 
@@ -1284,4 +1285,5 @@ void LedgerEntrySet::accountSend(const uint160& uSenderID, const uint160& uRecei
 		rippleSend(uSenderID, uReceiverID, saAmount);
 	}
 }
+
 // vim:ts=4
diff --git a/src/cpp/ripple/OfferCreateTransactor.cpp b/src/cpp/ripple/OfferCreateTransactor.cpp
index e612c502b8..1d8fb249dc 100644
--- a/src/cpp/ripple/OfferCreateTransactor.cpp
+++ b/src/cpp/ripple/OfferCreateTransactor.cpp
@@ -3,6 +3,8 @@
 #include <boost/foreach.hpp>
 #include <boost/bind.hpp>
 
+SETUP_LOG();
+
 // Take as much as possible. Adjusts account balances. Charges fees on top to taker.
 // -->   uBookBase: The order book to take against.
 // --> saTakerPays: What the taker offers (w/ issuer)
@@ -262,7 +264,6 @@ TER OfferCreateTransactor::doApply()
 	const uint32			uSequence		= mTxn.getSequence();
 
 	const uint256			uLedgerIndex	= Ledger::getOfferIndex(mTxnAccountID, uSequence);
-	SLE::pointer			sleOffer		= mEngine->entryCreate(ltOFFER, uLedgerIndex);
 
 	Log(lsINFO) << "doOfferCreate: Creating offer node: " << uLedgerIndex.ToString() << " uSequence=" << uSequence;
 
@@ -431,6 +432,8 @@ TER OfferCreateTransactor::doApply()
 			Log(lsWARNING) << "doOfferCreate: uPaysCurrency=" << saTakerPays.getHumanCurrency();
 			Log(lsWARNING) << "doOfferCreate: uGetsCurrency=" << saTakerGets.getHumanCurrency();
 
+			SLE::pointer			sleOffer		= mEngine->entryCreate(ltOFFER, uLedgerIndex);
+
 			sleOffer->setFieldAccount(sfAccount, mTxnAccountID);
 			sleOffer->setFieldU32(sfSequence, uSequence);
 			sleOffer->setFieldH256(sfBookDirectory, uDirectory);
@@ -444,11 +447,16 @@ TER OfferCreateTransactor::doApply()
 
 			if (bPassive)
 				sleOffer->setFlag(lsfPassive);
+
+			Log(lsINFO) << boost::str(boost::format("doOfferCreate: final terResult=%s sleOffer=%s")
+				% transToken(terResult)
+				% sleOffer->getJson(0));
 		}
 	}
 
-	Log(lsINFO) << "doOfferCreate: final sleOffer=" << sleOffer->getJson(0);
+	tLog(tesSUCCESS != terResult, lsINFO) << boost::str(boost::format("doOfferCreate: final terResult=%s") % transToken(terResult));
 
 	return terResult;
 }
+
 // vim:ts=4
diff --git a/src/cpp/ripple/TransactionEngine.cpp b/src/cpp/ripple/TransactionEngine.cpp
index a506c8d49d..3899ebfb4e 100644
--- a/src/cpp/ripple/TransactionEngine.cpp
+++ b/src/cpp/ripple/TransactionEngine.cpp
@@ -17,6 +17,7 @@
 #include "utils.h"
 
 SETUP_LOG();
+
 DECLARE_INSTANCE(TransactionEngine);
 
 void TransactionEngine::txnWrite()
diff --git a/src/cpp/ripple/TransactionErr.cpp b/src/cpp/ripple/TransactionErr.cpp
index 863b4956e7..a28ab5bc86 100644
--- a/src/cpp/ripple/TransactionErr.cpp
+++ b/src/cpp/ripple/TransactionErr.cpp
@@ -91,4 +91,5 @@ std::string transHuman(TER terCode)
 
 	return transResultInfo(terCode, strToken, strHuman) ? strHuman : "-";
 }
+
 // vim:ts=4
diff --git a/test/offer-test.js b/test/offer-test.js
index 42fe64f023..d7949bc268 100644
--- a/test/offer-test.js
+++ b/test/offer-test.js
@@ -451,7 +451,7 @@ buster.testCase("Offer tests", {
         });
     },
 
-  "//=>ripple currency conversion : offerer into debt" :
+  "ripple currency conversion : offerer into debt" :
     // alice in, carol out
     function (done) {
       var self = this;