Merge pull request #5954 from IntersectMBO/smelc/small-improvements-cardano-testnet

cardano-testnet: small improvements

Author: smelc

cardano-testnet/src/Testnet/Components/Configuration.hs

@@ -14,7 +14,7 @@ module Testnet.Components.Configuration
   , getByronGenesisHash
   , getShelleyGenesisHash
 
-  , NumPools
+  , NumPools(..)
   , numPools
   , NumDReps
   , numDReps

cardano-testnet/src/Testnet/Process/Run.hs

@@ -312,7 +312,11 @@ data ExecutableError
   = CannotDecodePlanJSON FilePath String
   | RetrievePlanJsonFailure IOException
   | ReadFileFailure IOException
-  | MissingExecutable FilePath String
+  | ExecutableMissingInComponent FilePath String
+    -- ^ Component with key @component-name@ is found, but it is missing
+    -- the @bin-file@ key.
+  | ExecutableNotFoundInPlan String
+    -- ^ Component with key @component-name@ cannot be found
   deriving Show
 
 
@@ -333,8 +337,8 @@ binDist pkg = do
     Right plan -> case List.filter matching (plan & installPlan) of
       (component:_) -> case component & binFile of
         Just bin -> return $ addExeSuffix (Text.unpack bin)
-        Nothing -> left $ MissingExecutable pJsonFp $ "missing bin-file in: " <> show component
-      [] -> error $ "Cannot find exe:" <> pkg <> " in plan"
+        Nothing -> left $ ExecutableMissingInComponent pJsonFp $ "missing \"bin-file\" key in plan component: " <> show component
+      [] -> left $ ExecutableNotFoundInPlan $ "Cannot find \"component-name\" key with value \"exe:" <> pkg <> "\""
     Left message -> left $ CannotDecodePlanJSON pJsonFp $ "Cannot decode plan: " <> message
   where matching :: Component -> Bool
         matching component = case componentName component of

cardano-testnet/src/Testnet/Property/Assert.hs

@@ -40,6 +40,7 @@ import           Data.Type.Equality
 import           Data.Word (Word8)
 import           GHC.Stack as GHC
 
+import           Testnet.Components.Configuration (NumPools(..), numPools)
 import           Testnet.Process.Run
 import           Testnet.Start.Types
 
@@ -87,7 +88,7 @@ assertExpectedSposInLedgerState
   -> ExecConfig
   -> m ()
 assertExpectedSposInLedgerState output tNetOptions execConfig = withFrozenCallStack $ do
-  let numExpectedPools = length $ cardanoNodes tNetOptions
+  let NumPools numExpectedPools = numPools tNetOptions
 
   void $ execCli' execConfig
       [ "query", "stake-pools"