Fix the tests

kadena-io · Aug 7, 2023 · dfd6e4b · dfd6e4b
1 parent a5e73c4
commit dfd6e4b
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 28 deletions.
diff --git a/chainweb.cabal b/chainweb.cabal
@@ -433,7 +433,7 @@ library
 -- -------------------------------------------------------------------------- --
 
 test-suite chainweb-tests
-    import: debugging-flags
+    import: warning-flags, debugging-flags
     default-language: Haskell2010
     ghc-options:
         -threaded

diff --git a/src/Chainweb/Pact/Backend/RelationalCheckpointer.hs b/src/Chainweb/Pact/Backend/RelationalCheckpointer.hs
@@ -69,6 +69,7 @@ import Chainweb.Pact.Backend.Types
 import Chainweb.Pact.Backend.Utils
 import Chainweb.Pact.Backend.DbCache (updateCacheStats)
 import Chainweb.Pact.Service.Types
+import Chainweb.Pact.Types (logError_)
 import Chainweb.Utils
 import Chainweb.Utils.Serialization
 import Chainweb.Version
@@ -166,30 +167,24 @@ initRelationalCheckpointer'' cpm bstate sqlenv loggr v cid = do
     db <- newMVar (BlockEnv dbenv bstate)
     runBlockEnv db initSchema
     let pactDbEnv = PactDbEnv chainwebPactDb db
-    let wrapReadOnlyMethod (name :: String) act = case cpm of
-          ReadWriteCheckpointer -> traceShowM (name <> " IS CALLED") >> act
-          ReadOnlyCheckpointer -> traceShowM (name <> " is not available in read-only mode") >> error $ name <> " is not available in read-only mode"
-          --traceShowM (name <> " IS CALLED") >> act --
+    let wrapReadOnlyMethod (name :: T.Text) act = case cpm of
+          ReadWriteCheckpointer -> act
+          ReadOnlyCheckpointer -> logError_ loggr $ name <> " is not available in read-only mode"
     let checkpointer = Checkpointer
           {
-            _cpRestore = wrapReadOnlyMethod "_cpRestore" $ doRestore v cid db
-          , _cpSave = wrapReadOnlyMethod "_cpSave" $ doSave db
-          , _cpDiscard = -- traceShowM ("_cpDiscard" :: String) >> -- called
-                   doDiscard db
-          , _cpGetLatestBlock = -- traceShowM ("_cpGetLatestBlock" :: String) >> -- called
-                   doGetLatest db
-          , _cpBeginCheckpointerBatch = -- traceShowM ("_cpBeginCheckpointerBatch" :: String) >> -- called
-                   doBeginBatch db
-          , _cpCommitCheckpointerBatch = -- traceShowM ("_cpCommitCheckpointerBatch" :: String) >> -- called
-                   doCommitBatch db
-          , _cpDiscardCheckpointerBatch = -- traceShowM ("_cpDiscardCheckpointerBatch" :: String) >> -- called
-                   doDiscardBatch db
-          , _cpLookupBlockInCheckpointer = wrapReadOnlyMethod "_cpLookupBlockInCheckpointer" $ doLookupBlock db
-          , _cpGetBlockParent = wrapReadOnlyMethod "_cpGetBlockParent" $ doGetBlockParent v cid db
-          , _cpRegisterProcessedTx = wrapReadOnlyMethod "_cpRegisterProcessedTx" $ doRegisterSuccessful db
-          , _cpLookupProcessedTx = wrapReadOnlyMethod "_cpLookupProcessedTx" $ doLookupSuccessful db
-          , _cpGetBlockHistory = wrapReadOnlyMethod "_cpGetBlockHistory" $ doGetBlockHistory db
-          , _cpGetHistoricalLookup = wrapReadOnlyMethod "_cpGetHistoricalLookup" $ doGetHistoricalLookup db
+            _cpRestore = doRestore v cid db
+          , _cpSave = \s -> wrapReadOnlyMethod "_cpSave" $ doSave db s
+          , _cpDiscard = doDiscard db
+          , _cpGetLatestBlock = doGetLatest db
+          , _cpBeginCheckpointerBatch = doBeginBatch db
+          , _cpCommitCheckpointerBatch = wrapReadOnlyMethod "_cpCommitCheckpointerBatch" $ doCommitBatch db
+          , _cpDiscardCheckpointerBatch = doDiscardBatch db
+          , _cpLookupBlockInCheckpointer = doLookupBlock db
+          , _cpGetBlockParent = doGetBlockParent v cid db
+          , _cpRegisterProcessedTx = doRegisterSuccessful db
+          , _cpLookupProcessedTx = doLookupSuccessful db
+          , _cpGetBlockHistory = doGetBlockHistory db
+          , _cpGetHistoricalLookup = doGetHistoricalLookup db
           , _cpLogger = loggr
           }
     return (pactDbEnv, checkpointer)

diff --git a/src/Chainweb/Pact/PactService/Checkpointer.hs b/src/Chainweb/Pact/PactService/Checkpointer.hs
@@ -225,7 +225,11 @@ withCheckpointerWithoutRewind' checkpointerMode target caller act = do
         Just h -> setParentHeader (caller <> ".withCheckpointerWithoutRewind") h
         Nothing -> return ()
 
-    local (over psCheckpointerDepth succ) $ mask $ \restore -> do
+    let
+        cpdepth = case checkpointerMode of
+            ReadWriteCheckpointer -> psCheckpointerDepth
+            ReadOnlyCheckpointer -> psReadCheckpointerDepth
+    local (over cpdepth succ) $ mask $ \restore -> do
         cenv <- restore $ liftIO $! _cpRestore checkPointer checkpointerTarget
 
         try (restore (act cenv)) >>= \case

diff --git a/test/ChainwebTests.hs b/test/ChainwebTests.hs
@@ -84,10 +84,10 @@ main = do
             defaultMainWithIngredients (consoleAndJsonReporter : defaultIngredients)
                 $ adjustOption adj
                 $ testGroup "Chainweb Tests" . schedule Sequential
-                $ [pactTestSuite rdb]
-                -- : mempoolTestSuite db h0
-                -- : rosettaTestSuite rdb
-                -- : suite rdb
+                $ pactTestSuite rdb
+                : mempoolTestSuite db h0
+                : rosettaTestSuite rdb
+                : suite rdb
   where
     adj NoTimeout = Timeout (1_000_000 * 60 * 10) "10m"
     adj x = x