ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove all IField/ITField functions. They are now obsolete.

Browse Source 
Use the correponding STObject functions.
This commit is contained in:
JoelKatz
2012-10-01 15:21:22 -07:00
parent 841a404114
commit 79c35f2689
21 changed files with 289 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/RippleCalc.cpp
View File

@@ -116,8 +116,8 @@ TER RippleCalc::calcNodeAdvance(
{
if (bFundsDirty)
{
saTakerPays = sleOffer->getIValueFieldAmount(sfTakerPays);
saTakerGets = sleOffer->getIValueFieldAmount(sfTakerGets);
saTakerPays = sleOffer->getValueFieldAmount(sfTakerPays);
saTakerGets = sleOffer->getValueFieldAmount(sfTakerGets);
saOfferFunds = lesActive.accountFunds(uOfrOwnerID, saTakerGets); // Funds left.
bFundsDirty = false;
@@ -153,13 +153,13 @@ TER RippleCalc::calcNodeAdvance(
{
// Got a new offer.
sleOffer = lesActive.entryCache(ltOFFER, uOfferIndex);
uOfrOwnerID = sleOffer->getIValueFieldAccount(sfAccount).getAccountID();
uOfrOwnerID = sleOffer->getValueFieldAccount(sfAccount).getAccountID();
const aciSource asLine = boost::make_tuple(uOfrOwnerID, uCurCurrencyID, uCurIssuerID);
Log(lsINFO) << boost::str(boost::format("calcNodeAdvance: uOfrOwnerID=%s") % NewcoinAddress::createHumanAccountID(uOfrOwnerID));
if (sleOffer->getIFieldPresent(sfExpiration) && sleOffer->getIFieldU32(sfExpiration) <= lesActive.getLedger()->getParentCloseTimeNC())
if (sleOffer->isFieldPresent(sfExpiration) && sleOffer->getValueFieldU32(sfExpiration) <= lesActive.getLedger()->getParentCloseTimeNC())
{
// Offer is expired.
Log(lsINFO) << "calcNodeAdvance: expired offer";
@@ -207,8 +207,8 @@ TER RippleCalc::calcNodeAdvance(
continue;
}
saTakerPays = sleOffer->getIValueFieldAmount(sfTakerPays);
saTakerGets = sleOffer->getIValueFieldAmount(sfTakerGets);
saTakerPays = sleOffer->getValueFieldAmount(sfTakerPays);
saTakerGets = sleOffer->getValueFieldAmount(sfTakerGets);
saOfferFunds = lesActive.accountFunds(uOfrOwnerID, saTakerGets); // Funds left.
@@ -430,8 +430,8 @@ TER RippleCalc::calcNodeDeliverRev(
lesActive.accountSend(uOfrOwnerID, uCurIssuerID, saOutPass);
// Adjust offer
sleOffer->setIFieldAmount(sfTakerGets, saTakerGets - saOutPass);
sleOffer->setIFieldAmount(sfTakerPays, saTakerPays - saInPassAct);
sleOffer->setValueFieldAmount(sfTakerGets, saTakerGets - saOutPass);
sleOffer->setValueFieldAmount(sfTakerPays, saTakerPays - saInPassAct);
lesActive.entryModify(sleOffer);
@@ -580,8 +580,8 @@ TER RippleCalc::calcNodeDeliverFwd(
lesActive.accountSend(uInAccountID, uOfrOwnerID, saInPassAct);
// Adjust offer
sleOffer->setIFieldAmount(sfTakerGets, saTakerGets - saOutPassAct);
sleOffer->setIFieldAmount(sfTakerPays, saTakerPays - saInPassAct);
sleOffer->setValueFieldAmount(sfTakerGets, saTakerGets - saOutPassAct);
sleOffer->setValueFieldAmount(sfTakerPays, saTakerPays - saInPassAct);
lesActive.entryModify(sleOffer);
@@ -2092,11 +2092,11 @@ void TransactionEngine::calcOfferBridgeNext(
SLE::pointer sleOffer = entryCache(ltOFFER, uOfferIndex);
uint160 uOfferOwnerID = sleOffer->getIValueFieldAccount(sfAccount).getAccountID();
STAmount saOfferPays = sleOffer->getIValueFieldAmount(sfTakerGets);
STAmount saOfferGets = sleOffer->getIValueFieldAmount(sfTakerPays);
uint160 uOfferOwnerID = sleOffer->getValueFieldAccount(sfAccount).getAccountID();
STAmount saOfferPays = sleOffer->getValueFieldAmount(sfTakerGets);
STAmount saOfferGets = sleOffer->getValueFieldAmount(sfTakerPays);
if (sleOffer->getIFieldPresent(sfExpiration) && sleOffer->getIFieldU32(sfExpiration) <= mLedger->getParentCloseTimeNC())
if (sleOffer->isFieldPresent(sfExpiration) && sleOffer->getValueFieldU32(sfExpiration) <= mLedger->getParentCloseTimeNC())
{
// Offer is expired.
Log(lsINFO) << "calcOfferFirst: encountered expired offer";