More CHaP updates

IntersectMBO · Dec 14, 2022 · c208ab2 · c208ab2
1 parent c3fe3d8
commit c208ab2
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 28 deletions.
diff --git a/cabal.project b/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-12-08T20:11:47Z
-index-state: cardano-haskell-packages 2022-12-03T17:19:15Z
+index-state: 2022-12-13T02:43:53Z
+index-state: cardano-haskell-packages 2022-12-14T00:40:15Z
 
 packages:
     cardano-api
@@ -171,14 +171,6 @@ allow-newer:
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
 
--- This is an IOG custom version with some hacks to force it to only provide HTTPS
--- connections. In talks with upstream on how to fix this.
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/threepenny-gui
-  tag: 15e501ae2d02799e5c7227f3007779d1cf53a71c
-  --sha256: 0j7bjdpqbja2n02k7n7k5m3vwjdj6a8a70g1ra6zxdr4fih5f8nm
-
 -- And has the adjustments for the ledger refactor
 source-repository-package
    type: git
@@ -197,13 +189,3 @@ source-repository-package
      ouroboros-network-framework
      ouroboros-network-testing
      ouroboros-consensus-cardano-tools
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: ffa32d6a0411b5ddb73eb79245a6ee907b57414d
-  --sha256: 1kj5c8r3g904h64vnsz2xs5128wpr3azry1gbpj9vnzcvvj00zw3
-  subdir:
-    contra-tracer
-    iohk-monitoring
-    tracer-transformers
diff --git a/cardano-testnet/src/Testnet/Byron.hs b/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 "Byron" $ H.assertM $ H.doesSprocketExist sprocket
 
   forM_ nodeIndexes $ \i -> do
     si <- H.noteShow $ show @Int i

diff --git a/cardano-testnet/src/Testnet/Cardano.hs b/cardano-testnet/src/Testnet/Cardano.hs
@@ -744,7 +744,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 "Cardano" $ H.assertM $ H.doesSprocketExist sprocket
 
   forM_ allNodeNames $ \node -> do
     nodeStdoutFile <- H.noteTempFile logDir $ node <> ".stdout.log"

diff --git a/cardano-testnet/src/Testnet/Shelley.hs b/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 "Shelley" $ H.assertM $ H.doesSprocketExist sprocket
 
   forM_ allNodes $ \node -> do
     nodeStdoutFile <- H.noteTempFile logDir $ node <> ".stdout.log"

diff --git a/cardano-testnet/test/Test/Cli/Babbage/LeadershipSchedule.hs b/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 "Line 121" $ 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 "Line 162" $ do
       void $ H.execCli' execConfig
         [ "query", "leadership-schedule"
         , "--testnet-magic", show @Int testnetMagic

diff --git a/cardano-testnet/test/Test/Cli/KesPeriodInfo.hs b/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 "Line 189" $ 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 "Line 261" $ 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 "Line 335" $ do
     void $ H.execCli' execConfig
       [ "query", "stake-pools"
       , "--testnet-magic", show @Int testnetMagic