Remove the version argument from advanceAllChains

kadena-io · Dec 18, 2024 · 327c726 · 327c726
1 parent 7b58aa2
commit 327c726
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/test/unit/Chainweb/Test/Pact5/CutFixture.hs b/test/unit/Chainweb/Test/Pact5/CutFixture.hs
@@ -115,18 +115,18 @@ mkFixture v pactServiceConfig baseRdb = do
             , _fixtureMempools = OnChains $ fst <$> perChain
             , _fixturePactQueues = OnChains $ snd <$> perChain
             }
-    _ <- liftIO $ advanceAllChains v fixture
+    _ <- liftIO $ advanceAllChains fixture
     return fixture
 
 -- | Advance all chains by one block, filling that block with whatever is in
 -- their mempools at the time.
 --
 advanceAllChains
     :: HasCallStack
-    => ChainwebVersion
-    -> Fixture
+    => Fixture
     -> IO (Cut, ChainMap (Vector (CommandResult Pact5.Hash Text)))
-advanceAllChains v Fixture{..} = do
+advanceAllChains Fixture{..} = do
+    let v = _chainwebVersion _fixtureCutDb
     latestCut <- liftIO $ _fixtureCutDb ^. cut
     let blockHeights = fmap (view blockHeight) $ latestCut ^. cutMap
     let latestBlockHeight = maximum blockHeights
@@ -149,10 +149,9 @@ advanceAllChains v Fixture{..} = do
 
 advanceAllChains_
     :: HasCallStack
-    => ChainwebVersion
-    -> Fixture
+    => Fixture
     -> IO ()
-advanceAllChains_ v f = void $ advanceAllChains v f
+advanceAllChains_ f = void $ advanceAllChains f
 
 withTestCutDb :: (Logger logger)
     => logger

diff --git a/test/unit/Chainweb/Test/Pact5/RemotePactTest.hs b/test/unit/Chainweb/Test/Pact5/RemotePactTest.hs
@@ -178,7 +178,7 @@ pollingConfirmationDepthTest baseRdb = runResourceT $ do
         pollingWithDepth v cid clientEnv rks (Just (ConfirmationDepth 0)) >>= \response -> do
             assertEqual "there are no command results at depth 0" response HashMap.empty
 
-        CutFixture.advanceAllChains_ v (fixture ^. cutFixture)
+        CutFixture.advanceAllChains_ (fixture ^. cutFixture)
 
         pollingWithDepth v cid clientEnv rks Nothing >>= \response -> do
             assertEqual "results are visible at depth 0" 2 (HashMap.size response)
@@ -187,7 +187,7 @@ pollingConfirmationDepthTest baseRdb = runResourceT $ do
         pollingWithDepth v cid clientEnv rks (Just (ConfirmationDepth 1)) >>= \response -> do
             assertEqual "results are not visible at depth 1" 0 (HashMap.size response)
 
-        CutFixture.advanceAllChains_ v (fixture ^. cutFixture)
+        CutFixture.advanceAllChains_ (fixture ^. cutFixture)
 
         pollingWithDepth v cid clientEnv rks Nothing >>= \response -> do
             assertEqual "results are visible at depth 0" 2 (HashMap.size response)
@@ -198,7 +198,7 @@ pollingConfirmationDepthTest baseRdb = runResourceT $ do
         pollingWithDepth v cid clientEnv rks (Just (ConfirmationDepth 2)) >>= \response -> do
             assertEqual "results are not visible at depth 2" 0 (HashMap.size response)
 
-        CutFixture.advanceAllChains_ v (fixture ^. cutFixture)
+        CutFixture.advanceAllChains_ (fixture ^. cutFixture)
 
         pollingWithDepth v cid clientEnv rks Nothing >>= \response -> do
             assertEqual "results are visible at depth 0" 2 (HashMap.size response)
@@ -243,12 +243,12 @@ spvTest baseRdb = runResourceT $ do
             $ defaultCmd
 
         sendReqKey <- fmap NE.head $ sending v srcChain clientEnv (NE.singleton send)
-        (sendCut, _) <- CutFixture.advanceAllChains v (fixture ^. cutFixture)
+        (sendCut, _) <- CutFixture.advanceAllChains (fixture ^. cutFixture)
         sendCr <- fmap (HashMap.! sendReqKey) $ pollingWithDepth v srcChain clientEnv (NE.singleton sendReqKey) (Just (ConfirmationDepth 0))
         let cont = fromMaybe (error "missing continuation") (_crContinuation sendCr)
 
         _ <- replicateM_ 10 $ do
-            CutFixture.advanceAllChains v (fixture ^. cutFixture)
+            CutFixture.advanceAllChains (fixture ^. cutFixture)
         let sendHeight = sendCut ^?! ixg srcChain . blockHeight
         spvProof <- createTransactionOutputProof_ (fixture ^. cutFixture . CutFixture.fixtureWebBlockHeaderDb) (fixture ^. cutFixture . CutFixture.fixturePayloadDb) targetChain srcChain sendHeight 0
         let contMsg = ContMsg
@@ -271,7 +271,7 @@ spvTest baseRdb = runResourceT $ do
             $ set cbGasLimit (GasLimit (Gas 1_000))
             $ defaultCmd
         recvReqKey <- fmap NE.head $ sending v targetChain clientEnv (NE.singleton recv)
-        _ <- CutFixture.advanceAllChains v (fixture ^. cutFixture)
+        _ <- CutFixture.advanceAllChains (fixture ^. cutFixture)
         recvCr <- fmap (HashMap.! recvReqKey) $ polling v targetChain clientEnv (NE.singleton recvReqKey)
         recvCr
             & P.allTrue