'Previous' is more logical than 'Last'. And let's be consistent.

This commit is contained in:
JoelKatz
2012-10-26 16:32:38 -07:00
parent bde211663f
commit c89390eb0c
4 changed files with 71 additions and 71 deletions

View File

@@ -75,37 +75,37 @@ Json::Value SerializedLedgerEntry::getJson(int options) const
bool SerializedLedgerEntry::isThreadedType()
{
return getFieldIndex(sfLastTxnID) != -1;
return getFieldIndex(sfPreviousTxnID) != -1;
}
bool SerializedLedgerEntry::isThreaded()
{
return isFieldPresent(sfLastTxnID);
return isFieldPresent(sfPreviousTxnID);
}
uint256 SerializedLedgerEntry::getThreadedTransaction()
{
return getFieldH256(sfLastTxnID);
return getFieldH256(sfPreviousTxnID);
}
uint32 SerializedLedgerEntry::getThreadedLedger()
{
return getFieldU32(sfLastTxnSeq);
return getFieldU32(sfPreviousTxnLgrSeq);
}
bool SerializedLedgerEntry::thread(const uint256& txID, uint32 ledgerSeq, uint256& prevTxID, uint32& prevLedgerID)
{
uint256 oldPrevTxID = getFieldH256(sfLastTxnID);
uint256 oldPrevTxID = getFieldH256(sfPreviousTxnID);
Log(lsTRACE) << "Thread Tx:" << txID << " prev:" << oldPrevTxID;
if (oldPrevTxID == txID)
{ // this transaction is already threaded
assert(getFieldU32(sfLastTxnSeq) == ledgerSeq);
assert(getFieldU32(sfPreviousTxnLgrSeq) == ledgerSeq);
return false;
}
prevTxID = oldPrevTxID;
prevLedgerID = getFieldU32(sfLastTxnSeq);
setFieldH256(sfLastTxnID, txID);
setFieldU32(sfLastTxnSeq, ledgerSeq);
prevLedgerID = getFieldU32(sfPreviousTxnLgrSeq);
setFieldH256(sfPreviousTxnID, txID);
setFieldU32(sfPreviousTxnLgrSeq, ledgerSeq);
return true;
}