Merge pull request #1131 from input-output-hk/ksaric/CSE-178-Reverse-…

…DB-block-order CSE-178 Reverse DB block order.
input-output-hk · Jul 10, 2017 · 97850b1 · 97850b1
2 parents 536446d + 1d3e438
commit 97850b1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Pos/Explorer/BListener.hs b/src/Pos/Explorer/BListener.hs
@@ -35,7 +35,7 @@ import           Pos.Explorer.DB              (Page, Epoch)
 import qualified Pos.Explorer.DB              as DB
 import           Pos.Ssc.Class.Helpers        (SscHelpersClass)
 import           Pos.Util.Chrono              (NE, NewestFirst (..),
-                                               OldestFirst (..))
+                                               OldestFirst (..), toNewestFirst)
 
 ----------------------------------------------------------------------------
 -- Declarations
@@ -329,7 +329,10 @@ onApplyKeyBlocksGeneral blunds newBlocksMapF = do
     newBlocks = newBlocksMapF blocksNE
 
     blocksNE :: NE (Block ssc)  
-    blocksNE = fst <$> getOldestFirst blunds
+    blocksNE = fst <$> getNewestFirst blocksNewF
+
+    blocksNewF :: NewestFirst NE (Blund ssc) 
+    blocksNewF = toNewestFirst blunds
 
 
 -- A general @Key@ @Block@ database application for the rollback call.

diff --git a/txp/Pos/Txp/MemState/Class.hs b/txp/Pos/Txp/MemState/Class.hs
@@ -7,6 +7,7 @@
 module Pos.Txp.MemState.Class
        ( MonadTxpMem
        , askTxpMem
+       , askTxpMemAndMetrics
        , TxpHolderTag
        , getUtxoModifier
        , getLocalTxsNUndo