Merge #4714

4714: Update index state and hedgehog-extras. r=newhoggy a=newhoggy



Co-authored-by: John Ky <[email protected]>

Author: iohk-bors[bot]

cabal.project

@@ -12,8 +12,8 @@ repository cardano-haskell-packages
 
 -- See CONTRIBUTING for information about these, including some Nix commands
 -- you need to run if you change them
-index-state: 2022-11-11T00:00:00Z
-index-state: cardano-haskell-packages 2022-11-12T20:00:00Z
+index-state: 2022-12-13T02:43:53Z
+index-state: cardano-haskell-packages 2022-12-14T00:40:15Z
 
 packages:
     cardano-api
@@ -87,7 +87,21 @@ constraints:
   -- TODO: these should be set in cabal files, but avoiding setting them in lower dependencies for initial CHaP release
 
   -- Needed until ouroboros-network gets proper bounds
-  , cardano-binary  == 1.5.0
+  , byron-spec-chain == 0.1.1.1
+  , byron-spec-ledger == 0.1.1.1
+  , cardano-binary == 1.5.0
+  , cardano-ledger-alonzo == 0.1.1.1
+  , cardano-ledger-babbage == 0.1.1.1
+  , cardano-ledger-byron == 0.1.1.1
+  , cardano-ledger-byron-test == 1.4.1
+  , cardano-ledger-conway == 0.1.1.1
+  , cardano-ledger-core == 0.1.1.1
+  , cardano-ledger-pretty == 0.1.1.1
+  , cardano-ledger-shelley == 0.1.1.1
+  , cardano-ledger-shelley-ma == 0.1.1.1
+  , cardano-ledger-shelley-test == 0.1.1.1
+  , cardano-protocol-tpraos == 0.1.1.1
+  , hedgehog-extras >= 0.3
 
 -- We'll need this once ouroboros has been pushed into CHaP
 -- extra-packages:
@@ -135,4 +149,3 @@ source-repository-package
      ouroboros-network-framework
      ouroboros-network-testing
      ouroboros-consensus-cardano-tools
-

cardano-testnet/src/Testnet/Byron.hs

@@ -237,7 +237,7 @@ testnet testnetOptions H.Conf {..} = do
     sprocket <- H.noteShow $ Sprocket tempBaseAbsPath (socketDir </> "node-" <> si)
     _spocketSystemNameFile <- H.noteShow $ IO.sprocketSystemName sprocket
     -- TODO: Better error message need to indicate a sprocket was not created
-    H.byDeadlineM 10 deadline $ H.assertM $ H.doesSprocketExist sprocket
+    H.byDeadlineM 10 deadline "Failed to connect to node socket" $ H.assertM $ H.doesSprocketExist sprocket
 
   forM_ nodeIndexes $ \i -> do
     si <- H.noteShow $ show @Int i

cardano-testnet/src/Testnet/Cardano.hs

@@ -759,7 +759,7 @@ cardanoTestnet testnetOptions H.Conf {..} = do
   forM_ allNodeNames $ \node -> do
     sprocket <- H.noteShow $ Sprocket tempBaseAbsPath (socketDir </> node)
     _spocketSystemNameFile <- H.noteShow $ IO.sprocketSystemName sprocket
-    H.byDeadlineM 10 deadline $ H.assertM $ H.doesSprocketExist sprocket
+    H.byDeadlineM 10 deadline "Failed to connect to node socket" $ H.assertM $ H.doesSprocketExist sprocket
 
   forM_ allNodeNames $ \node -> do
     nodeStdoutFile <- H.noteTempFile logDir $ node <> ".stdout.log"

cardano-testnet/src/Testnet/Shelley.hs

@@ -417,7 +417,7 @@ shelleyTestnet testnetOptions H.Conf {..} = do
   forM_ allNodes $ \node -> do
     sprocket <- H.noteShow $ Sprocket tempBaseAbsPath (socketDir </> node)
     _spocketSystemNameFile <- H.noteShow $ IO.sprocketSystemName sprocket
-    H.byDeadlineM 10 deadline $ H.assertM $ H.doesSprocketExist sprocket
+    H.byDeadlineM 10 deadline "Failed to connect to node socket" $ H.assertM $ H.doesSprocketExist sprocket
 
   forM_ allNodes $ \node -> do
     nodeStdoutFile <- H.noteTempFile logDir $ node <> ".stdout.log"

cardano-testnet/test/Test/Cli/Babbage/LeadershipSchedule.hs

@@ -118,7 +118,7 @@ hprop_leadershipSchedule = H.integration . H.runFinallies . H.workspace "alonzo"
 
     leadershipScheduleDeadline <- H.noteShowM $ DTC.addUTCTime 180 <$> H.noteShowIO DTC.getCurrentTime
 
-    H.byDeadlineM 5 leadershipScheduleDeadline $ do
+    H.byDeadlineM 5 leadershipScheduleDeadline "Failed to query for leadership schedule" $ do
       void $ H.execCli' execConfig
         [ "query", "leadership-schedule"
         , "--testnet-magic", show @Int testnetMagic
@@ -159,7 +159,7 @@ hprop_leadershipSchedule = H.integration . H.runFinallies . H.workspace "alonzo"
 
     leadershipScheduleDeadline <- H.noteShowM $ DTC.addUTCTime 180 <$> H.noteShowIO DTC.getCurrentTime
 
-    H.byDeadlineM 5 leadershipScheduleDeadline $ do
+    H.byDeadlineM 5 leadershipScheduleDeadline "Failed to query for leadership schedule" $ do
       void $ H.execCli' execConfig
         [ "query", "leadership-schedule"
         , "--testnet-magic", show @Int testnetMagic

cardano-testnet/test/Test/Cli/KesPeriodInfo.hs

@@ -186,7 +186,7 @@ hprop_kes_period_info = H.integration . H.runFinallies . H.workspace "chairman"
                , "--testnet-magic", show @Int testnetMagic
                ]
 
-  delegsAndRewards <- H.byDurationM 3 12 $ do
+  delegsAndRewards <- H.byDurationM 3 12 "Pledge's stake address was not registered" $ do
     -- Check to see if pledge's stake address was registered
 
     void $ H.execCli' execConfig
@@ -258,7 +258,7 @@ hprop_kes_period_info = H.integration . H.runFinallies . H.workspace "chairman"
 
   H.note_ $ "Check to see if " <> utxoStakingVkey2 <> " was registered..."
 
-  userSAddr <- H.byDurationM 3 12 $ do
+  userSAddr <- H.byDurationM 3 12 "Failed to query stake address info" $ do
     void $ H.execCli' execConfig
       [ "query", "stake-address-info"
       , "--address", utxostakingaddr
@@ -332,7 +332,7 @@ hprop_kes_period_info = H.integration . H.runFinallies . H.workspace "chairman"
     , "--testnet-magic", show @Int testnetMagic
     ]
 
-  H.byDurationM 3 12 $ do
+  H.byDurationM 3 12 "Stake pool was not registered" $ do
     void $ H.execCli' execConfig
       [ "query", "stake-pools"
       , "--testnet-magic", show @Int testnetMagic