From 718d1ffa48db24b132a6cc041eb3a413fcd1869d Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Tue, 17 Jul 2012 22:14:08 -0700 Subject: [PATCH] Change first/last/next/prev SLE functions to just return uint256's. --- src/Ledger.h | 12 ++++++------ src/LedgerNode.cpp | 36 ++++++++++++++---------------------- 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/src/Ledger.h b/src/Ledger.h index e08100ac89..3c799ab1dc 100644 --- a/src/Ledger.h +++ b/src/Ledger.h @@ -167,12 +167,12 @@ public: // next/prev function SLE::pointer getSLE(const uint256& uHash); - SLE::pointer getFirstSLE(); - SLE::pointer getLastSLE(); - SLE::pointer getNextSLE(const uint256& uHash); // first node >hash - SLE::pointer getNextSLE(const uint256& uHash, const uint256& uEnd); // first node >hash, begin + uint256 getFirstLedgerID(); + uint256 getLastLedgerID(); + uint256 getNextLedgerID(const uint256& uHash); // first node >hash + uint256 getNextLedgerID(const uint256& uHash, const uint256& uEnd); // first node >hash, begin // index calculation functions static uint256 getAccountRootIndex(const uint160& uAccountID); diff --git a/src/LedgerNode.cpp b/src/LedgerNode.cpp index 442925875c..c04b6715a2 100644 --- a/src/LedgerNode.cpp +++ b/src/LedgerNode.cpp @@ -53,52 +53,44 @@ SLE::pointer Ledger::getSLE(const uint256& uHash) return boost::make_shared(node->peekSerializer(), node->getTag()); } -SLE::pointer Ledger::getFirstSLE() +uint256 Ledger::getFirstLedgerID() { SHAMapItem::pointer node = mAccountStateMap->peekFirstItem(); - if (!node) - return SLE::pointer(); - return boost::make_shared(node->peekSerializer(), node->getTag()); + return node ? node->getTag() : uint256(); } -SLE::pointer Ledger::getLastSLE() +uint256 Ledger::getLastLedgerID() { SHAMapItem::pointer node = mAccountStateMap->peekLastItem(); - if (!node) - return SLE::pointer(); - return boost::make_shared(node->peekSerializer(), node->getTag()); + return node ? node->getTag() : uint256(); } -SLE::pointer Ledger::getNextSLE(const uint256& uHash) +uint256 Ledger::getNextLedgerID(const uint256& uHash) { SHAMapItem::pointer node = mAccountStateMap->peekNextItem(uHash); - if (!node) - return SLE::pointer(); - return boost::make_shared(node->peekSerializer(), node->getTag()); + return node ? node->getTag() : uint256(); } -SLE::pointer Ledger::getNextSLE(const uint256& uHash, const uint256& uEnd) +uint256 Ledger::getNextLedgerID(const uint256& uHash, const uint256& uEnd) { SHAMapItem::pointer node = mAccountStateMap->peekNextItem(uHash); if ((!node) || (node->getTag() > uEnd)) - return SLE::pointer(); - return boost::make_shared(node->peekSerializer(), node->getTag()); + return uint256(); + return node->getTag(); } -SLE::pointer Ledger::getPrevSLE(const uint256& uHash) +uint256 Ledger::getPrevLedgerID(const uint256& uHash) { SHAMapItem::pointer node = mAccountStateMap->peekPrevItem(uHash); - if (!node) - return SLE::pointer(); - return boost::make_shared(node->peekSerializer(), node->getTag()); + return node ? node->getTag() : uint256(); } -SLE::pointer Ledger::getPrevSLE(const uint256& uHash, const uint256& uBegin) +uint256 Ledger::getPrevLedgerID(const uint256& uHash, const uint256& uBegin) { SHAMapItem::pointer node = mAccountStateMap->peekNextItem(uHash); if ((!node) || (node->getTag() < uBegin)) - return SLE::pointer(); - return boost::make_shared(node->peekSerializer(), node->getTag()); + return uint256(); + return node->getTag(); } SLE::pointer Ledger::getASNode(LedgerStateParms& parms, const uint256& nodeID,