From 64994268d3eaf485f9c4246bdf2405920e87e169 Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Wed, 6 Mar 2013 01:05:00 -0800 Subject: [PATCH] Rename tfMarket to tfImmediateOrCancel. --- src/cpp/ripple/OfferCreateTransactor.cpp | 32 ++++++++++++------------ src/cpp/ripple/TransactionFormats.h | 4 +-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/cpp/ripple/OfferCreateTransactor.cpp b/src/cpp/ripple/OfferCreateTransactor.cpp index ce1206d358..a70f191356 100644 --- a/src/cpp/ripple/OfferCreateTransactor.cpp +++ b/src/cpp/ripple/OfferCreateTransactor.cpp @@ -339,31 +339,31 @@ TER OfferCreateTransactor::takeOffers( TER OfferCreateTransactor::doApply() { cLog(lsWARNING) << "OfferCreate> " << mTxn.getJson(0); - const uint32 uTxFlags = mTxn.getFlags(); - const bool bPassive = isSetBit(uTxFlags, tfPassive); - const bool bMarket = isSetBit(uTxFlags, tfMarket); - STAmount saTakerPays = mTxn.getFieldAmount(sfTakerPays); - STAmount saTakerGets = mTxn.getFieldAmount(sfTakerGets); + const uint32 uTxFlags = mTxn.getFlags(); + const bool bPassive = isSetBit(uTxFlags, tfPassive); + const bool bImmediateOrCancel = isSetBit(uTxFlags, tfImmediateOrCancel); + STAmount saTakerPays = mTxn.getFieldAmount(sfTakerPays); + STAmount saTakerGets = mTxn.getFieldAmount(sfTakerGets); cLog(lsINFO) << boost::str(boost::format("OfferCreate: saTakerPays=%s saTakerGets=%s") % saTakerPays.getFullText() % saTakerGets.getFullText()); - const uint160 uPaysIssuerID = saTakerPays.getIssuer(); - const uint160 uGetsIssuerID = saTakerGets.getIssuer(); - const uint32 uExpiration = mTxn.getFieldU32(sfExpiration); - const bool bHaveExpiration = mTxn.isFieldPresent(sfExpiration); - const uint32 uSequence = mTxn.getSequence(); + const uint160 uPaysIssuerID = saTakerPays.getIssuer(); + const uint160 uGetsIssuerID = saTakerGets.getIssuer(); + const uint32 uExpiration = mTxn.getFieldU32(sfExpiration); + const bool bHaveExpiration = mTxn.isFieldPresent(sfExpiration); + const uint32 uSequence = mTxn.getSequence(); - const uint256 uLedgerIndex = Ledger::getOfferIndex(mTxnAccountID, uSequence); + const uint256 uLedgerIndex = Ledger::getOfferIndex(mTxnAccountID, uSequence); cLog(lsINFO) << "OfferCreate: Creating offer node: " << uLedgerIndex.ToString() << " uSequence=" << uSequence; - const uint160 uPaysCurrency = saTakerPays.getCurrency(); - const uint160 uGetsCurrency = saTakerGets.getCurrency(); - const uint64 uRate = STAmount::getRate(saTakerGets, saTakerPays); + const uint160 uPaysCurrency = saTakerPays.getCurrency(); + const uint160 uGetsCurrency = saTakerGets.getCurrency(); + const uint64 uRate = STAmount::getRate(saTakerGets, saTakerPays); - TER terResult = tesSUCCESS; + TER terResult = tesSUCCESS; uint256 uDirectory; // Delete hints. uint64 uOwnerNode; uint64 uBookNode; @@ -493,7 +493,7 @@ TER OfferCreateTransactor::doApply() else if ( !saTakerPays // Wants nothing more. || !saTakerGets // Offering nothing more. - || bMarket // Do not persist. + || bImmediateOrCancel // Do not persist. || !mEngine->getNodes().accountFunds(mTxnAccountID, saTakerGets).isPositive() // Not funded. || bUnfunded) // Consider unfunded. { diff --git a/src/cpp/ripple/TransactionFormats.h b/src/cpp/ripple/TransactionFormats.h index a1c9161bb2..9a279610c7 100644 --- a/src/cpp/ripple/TransactionFormats.h +++ b/src/cpp/ripple/TransactionFormats.h @@ -68,8 +68,8 @@ const uint32 tfAccountSetMask = ~(tfRequireDestTag|tfOptionalDestTag|tfRequireA // OfferCreate flags: const uint32 tfPassive = 0x00010000; -const uint32 tfMarket = 0x00020000; -const uint32 tfOfferCreateMask = ~(tfPassive|tfMarket); +const uint32 tfImmediateOrCancel = 0x00020000; +const uint32 tfOfferCreateMask = ~(tfPassive|tfImmediateOrCancel); // Payment flags: const uint32 tfNoRippleDirect = 0x00010000;