From c89390eb0cf49b6a496733d071b395ba7bb40e21 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Fri, 26 Oct 2012 16:32:38 -0700 Subject: [PATCH] 'Previous' is more logical than 'Last'. And let's be consistent. --- src/LedgerFormats.cpp | 108 +++++++++++++++++++-------------------- src/SerializeProto.h | 4 +- src/SerializedLedger.cpp | 18 +++---- src/TransactionMeta.cpp | 12 ++--- 4 files changed, 71 insertions(+), 71 deletions(-) diff --git a/src/LedgerFormats.cpp b/src/LedgerFormats.cpp index c696d72ed..c187286cd 100644 --- a/src/LedgerFormats.cpp +++ b/src/LedgerFormats.cpp @@ -4,10 +4,10 @@ std::map LedgerEntryFormat::byType; std::map LedgerEntryFormat::byName; -#define LEF_BASE \ - << SOElement(sfLedgerIndex, SOE_OPTIONAL) \ - << SOElement(sfLedgerEntryType, SOE_REQUIRED) \ - << SOElement(sfFlags, SOE_REQUIRED) +#define LEF_BASE \ + << SOElement(sfLedgerIndex, SOE_OPTIONAL) \ + << SOElement(sfLedgerEntryType, SOE_REQUIRED) \ + << SOElement(sfFlags, SOE_REQUIRED) #define DECLARE_LEF(name, type) lef = new LedgerEntryFormat(#name, type); (*lef) LEF_BASE @@ -16,74 +16,74 @@ static bool LEFInit() LedgerEntryFormat* lef; DECLARE_LEF(AccountRoot, ltACCOUNT_ROOT) - << SOElement(sfAccount, SOE_REQUIRED) - << SOElement(sfSequence, SOE_REQUIRED) - << SOElement(sfBalance, SOE_REQUIRED) - << SOElement(sfLastTxnID, SOE_REQUIRED) - << SOElement(sfLastTxnSeq, SOE_REQUIRED) - << SOElement(sfAuthorizedKey, SOE_OPTIONAL) - << SOElement(sfEmailHash, SOE_OPTIONAL) - << SOElement(sfWalletLocator, SOE_OPTIONAL) - << SOElement(sfMessageKey, SOE_OPTIONAL) - << SOElement(sfTransferRate, SOE_OPTIONAL) - << SOElement(sfDomain, SOE_OPTIONAL) - << SOElement(sfPublishHash, SOE_OPTIONAL) - << SOElement(sfPublishSize, SOE_OPTIONAL) + << SOElement(sfAccount, SOE_REQUIRED) + << SOElement(sfSequence, SOE_REQUIRED) + << SOElement(sfBalance, SOE_REQUIRED) + << SOElement(sfPreviousTxnID, SOE_REQUIRED) + << SOElement(sfPreviousTxnLgrSeq, SOE_REQUIRED) + << SOElement(sfAuthorizedKey, SOE_OPTIONAL) + << SOElement(sfEmailHash, SOE_OPTIONAL) + << SOElement(sfWalletLocator, SOE_OPTIONAL) + << SOElement(sfMessageKey, SOE_OPTIONAL) + << SOElement(sfTransferRate, SOE_OPTIONAL) + << SOElement(sfDomain, SOE_OPTIONAL) + << SOElement(sfPublishHash, SOE_OPTIONAL) + << SOElement(sfPublishSize, SOE_OPTIONAL) ; DECLARE_LEF(Contract, ltCONTRACT) - << SOElement(sfAccount, SOE_REQUIRED) - << SOElement(sfBalance, SOE_REQUIRED) - << SOElement(sfLastTxnID, SOE_REQUIRED) - << SOElement(sfLastTxnSeq, SOE_REQUIRED) - << SOElement(sfIssuer, SOE_REQUIRED) - << SOElement(sfOwner, SOE_REQUIRED) - << SOElement(sfExpiration, SOE_REQUIRED) - << SOElement(sfBondAmount, SOE_REQUIRED) - << SOElement(sfCreateCode, SOE_REQUIRED) - << SOElement(sfFundCode, SOE_REQUIRED) - << SOElement(sfRemoveCode, SOE_REQUIRED) - << SOElement(sfExpireCode, SOE_REQUIRED) + << SOElement(sfAccount, SOE_REQUIRED) + << SOElement(sfBalance, SOE_REQUIRED) + << SOElement(sfPreviousTxnID, SOE_REQUIRED) + << SOElement(sfPreviousTxnLgrSeq, SOE_REQUIRED) + << SOElement(sfIssuer, SOE_REQUIRED) + << SOElement(sfOwner, SOE_REQUIRED) + << SOElement(sfExpiration, SOE_REQUIRED) + << SOElement(sfBondAmount, SOE_REQUIRED) + << SOElement(sfCreateCode, SOE_REQUIRED) + << SOElement(sfFundCode, SOE_REQUIRED) + << SOElement(sfRemoveCode, SOE_REQUIRED) + << SOElement(sfExpireCode, SOE_REQUIRED) ; DECLARE_LEF(DirectoryNode, ltDIR_NODE) - << SOElement(sfIndexes, SOE_REQUIRED) - << SOElement(sfIndexNext, SOE_OPTIONAL) - << SOElement(sfIndexPrevious, SOE_OPTIONAL) + << SOElement(sfIndexes, SOE_REQUIRED) + << SOElement(sfIndexNext, SOE_OPTIONAL) + << SOElement(sfIndexPrevious, SOE_OPTIONAL) ; DECLARE_LEF(GeneratorMap, ltGENERATOR_MAP) - << SOElement(sfGenerator, SOE_REQUIRED) + << SOElement(sfGenerator, SOE_REQUIRED) ; DECLARE_LEF(Nickname, ltNICKNAME) - << SOElement(sfAccount, SOE_REQUIRED) - << SOElement(sfMinimumOffer, SOE_OPTIONAL) + << SOElement(sfAccount, SOE_REQUIRED) + << SOElement(sfMinimumOffer, SOE_OPTIONAL) ; DECLARE_LEF(Offer, ltOFFER) - << SOElement(sfAccount, SOE_REQUIRED) - << SOElement(sfSequence, SOE_REQUIRED) - << SOElement(sfTakerPays, SOE_REQUIRED) - << SOElement(sfTakerGets, SOE_REQUIRED) - << SOElement(sfBookDirectory, SOE_REQUIRED) - << SOElement(sfBookNode, SOE_REQUIRED) - << SOElement(sfOwnerNode, SOE_REQUIRED) - << SOElement(sfLastTxnID, SOE_REQUIRED) - << SOElement(sfLastTxnSeq, SOE_REQUIRED) - << SOElement(sfExpiration, SOE_OPTIONAL) + << SOElement(sfAccount, SOE_REQUIRED) + << SOElement(sfSequence, SOE_REQUIRED) + << SOElement(sfTakerPays, SOE_REQUIRED) + << SOElement(sfTakerGets, SOE_REQUIRED) + << SOElement(sfBookDirectory, SOE_REQUIRED) + << SOElement(sfBookNode, SOE_REQUIRED) + << SOElement(sfOwnerNode, SOE_REQUIRED) + << SOElement(sfPreviousTxnID, SOE_REQUIRED) + << SOElement(sfPreviousTxnLgrSeq, SOE_REQUIRED) + << SOElement(sfExpiration, SOE_OPTIONAL) ; DECLARE_LEF(RippleState, ltRIPPLE_STATE) - << SOElement(sfBalance, SOE_REQUIRED) - << SOElement(sfLowLimit, SOE_REQUIRED) - << SOElement(sfHighLimit, SOE_REQUIRED) - << SOElement(sfLastTxnID, SOE_REQUIRED) - << SOElement(sfLastTxnSeq, SOE_REQUIRED) - << SOElement(sfLowQualityIn, SOE_OPTIONAL) - << SOElement(sfLowQualityOut, SOE_OPTIONAL) - << SOElement(sfHighQualityIn, SOE_OPTIONAL) - << SOElement(sfHighQualityOut, SOE_OPTIONAL) + << SOElement(sfBalance, SOE_REQUIRED) + << SOElement(sfLowLimit, SOE_REQUIRED) + << SOElement(sfHighLimit, SOE_REQUIRED) + << SOElement(sfPreviousTxnID, SOE_REQUIRED) + << SOElement(sfPreviousTxnLgrSeq, SOE_REQUIRED) + << SOElement(sfLowQualityIn, SOE_OPTIONAL) + << SOElement(sfLowQualityOut, SOE_OPTIONAL) + << SOElement(sfHighQualityIn, SOE_OPTIONAL) + << SOElement(sfHighQualityOut, SOE_OPTIONAL) ; return true; diff --git a/src/SerializeProto.h b/src/SerializeProto.h index 0654aa4c3..2fa8dbf00 100644 --- a/src/SerializeProto.h +++ b/src/SerializeProto.h @@ -35,7 +35,7 @@ FIELD(Flags, UINT32, 2) FIELD(SourceTag, UINT32, 3) FIELD(Sequence, UINT32, 4) - FIELD(LastTxnSeq, UINT32, 5) + FIELD(PreviousTxnLgrSeq, UINT32, 5) FIELD(LedgerSequence, UINT32, 6) FIELD(CloseTime, UINT32, 7) FIELD(ParentCloseTime, UINT32, 8) @@ -71,7 +71,7 @@ FIELD(ParentHash, HASH256, 2) FIELD(TransactionHash, HASH256, 3) FIELD(AccountHash, HASH256, 4) - FIELD(LastTxnID, HASH256, 5) + FIELD(PreviousTxnID, HASH256, 5) FIELD(LedgerIndex, HASH256, 6) FIELD(WalletLocator, HASH256, 7) FIELD(PublishHash, HASH256, 8) diff --git a/src/SerializedLedger.cpp b/src/SerializedLedger.cpp index 0e22a190e..359a93fa5 100644 --- a/src/SerializedLedger.cpp +++ b/src/SerializedLedger.cpp @@ -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; } diff --git a/src/TransactionMeta.cpp b/src/TransactionMeta.cpp index 2a504247c..f8fdff08d 100644 --- a/src/TransactionMeta.cpp +++ b/src/TransactionMeta.cpp @@ -101,15 +101,15 @@ void TransactionMetaSet::swap(TransactionMetaSet& s) bool TransactionMetaSet::thread(STObject& node, const uint256& prevTxID, uint32 prevLgrID) { - if (node.getFieldIndex(sfLastTxnID) == -1) + if (node.getFieldIndex(sfPreviousTxnID) == -1) { - assert(node.getFieldIndex(sfLastTxnSeq) == -1); - node.setFieldH256(sfLastTxnID, prevTxID); - node.setFieldU32(sfLastTxnSeq, prevLgrID); + assert(node.getFieldIndex(sfPreviousTxnLgrSeq) == -1); + node.setFieldH256(sfPreviousTxnID, prevTxID); + node.setFieldU32(sfPreviousTxnLgrSeq, prevLgrID); return true; } - assert(node.getFieldH256(sfLastTxnID) == prevTxID); - assert(node.getFieldU32(sfLastTxnSeq) == prevLgrID); + assert(node.getFieldH256(sfPreviousTxnID) == prevTxID); + assert(node.getFieldU32(sfPreviousTxnLgrSeq) == prevLgrID); return false; }