address feedback from review II

Author: MarcFontaine

cardano-node-chairman/test/Spec/Chairman/Cardano.hs

@@ -11,6 +11,8 @@ import           Data.Maybe
 import           Spec.Chairman.Chairman (chairmanOver)
 import           System.FilePath ((</>))
 
+import           Testnet ( TestnetOptions( CardanoOnlyTestnetOptions),  testnet)
+
 import qualified Hedgehog as H
 import qualified Hedgehog.Extras.Test.Base as H
 import qualified Hedgehog.Extras.Test.Process as H
@@ -30,6 +32,6 @@ hprop_chairman = H.integration . H.runFinallies . H.workspace "chairman" $ \temp
   configurationTemplate <- H.noteShow $ base </> "configuration/defaults/byron-mainnet/configuration.yaml"
   conf <- H.mkConf (H.ProjectBase base) (H.YamlFilePath configurationTemplate) tempAbsPath' Nothing
 
-  allNodes <- fmap H.nodeName . H.allNodes <$> H.cardanoTestnet H.defaultTestnetOptions conf
+  allNodes <- fmap H.nodeName . H.allNodes <$> testnet (CardanoOnlyTestnetOptions H.defaultTestnetOptions) conf
 
   chairmanOver 120 50 conf allNodes

cardano-testnet/src/Testnet/Utils.hs

@@ -26,6 +26,7 @@ import           Hedgehog.Extras.Test.Process (ExecConfig)
 import           Hedgehog.Internal.Property (MonadTest)
 import qualified Test.Process as H
 
+
 -- | Submit the desired epoch to wait to.
 waitUntilEpoch
   :: (MonadCatch m, MonadIO m, MonadTest m)

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

@@ -40,9 +40,9 @@ import qualified System.Info as SYS
 import qualified Test.Base as H
 import qualified Test.Process as H
 import qualified Test.Runtime as TR
+import           Testnet (TestnetOptions( CardanoOnlyTestnetOptions),  testnet)
 import qualified Testnet.Cardano as TC
-import           Testnet.Cardano (CardanoTestnetOptions (..), TestnetRuntime (..),
-                   defaultTestnetNodeOptions, defaultTestnetOptions, cardanoTestnet)
+import           Testnet.Cardano (defaultTestnetNodeOptions, defaultTestnetOptions, cardanoTestnet)
 import qualified Testnet.Conf as H
 import           Testnet.Conf (ProjectBase (..), YamlFilePath (..))
 import           Testnet.Utils (waitUntilEpoch)
@@ -60,13 +60,13 @@ hprop_kes_period_info = H.integration . H.runFinallies . H.workspace "chairman"
     <- H.noteShowM $ H.mkConf (ProjectBase base) (YamlFilePath configurationTemplate)
                               tempAbsBasePath' Nothing
 
-  let fastTestnetOptions = defaultTestnetOptions
+  let fastTestnetOptions = CardanoOnlyTestnetOptions $ defaultTestnetOptions
                              { bftNodeOptions = replicate 1 defaultTestnetNodeOptions
                              , epochLength = 500
                              , slotLength = 0.02
                              , activeSlotsCoeff = 0.1
                              }
-  runTime@TC.TestnetRuntime { testnetMagic } <- cardanoTestnet fastTestnetOptions conf
+  runTime@TC.TestnetRuntime { testnetMagic } <- testnet fastTestnetOptions conf
   let sprockets = TR.bftSprockets runTime
   env <- H.evalIO getEnvironment
 

cardano-testnet/test/Spec/ShutdownOnSlotSynced.hs

@@ -29,9 +29,10 @@ import qualified Hedgehog.Extras.Test.Process as H
 import qualified System.Directory as IO
 import qualified Test.Base as H
 import           Test.Runtime (NodeRuntime (..))
+import           Testnet (TestnetOptions( CardanoOnlyTestnetOptions),  testnet)
 import           Testnet.Cardano (TestnetNodeOptions (TestnetNodeOptions),
                    CardanoTestnetOptions (..), TestnetRuntime (..), defaultTestnetNodeOptions,
-                   defaultTestnetOptions, cardanoTestnet)
+                   defaultTestnetOptions)
 import qualified Testnet.Cardano as TC
 import qualified Testnet.Conf as H
 
@@ -44,7 +45,7 @@ hprop_shutdownOnSlotSynced = H.integration . H.runFinallies . H.workspace "chair
     H.mkConf (H.ProjectBase base) (H.YamlFilePath configurationTemplate) tempAbsBasePath' Nothing
   let maxSlot = 1500
       slotLen = 0.01
-  let fastTestnetOptions = defaultTestnetOptions
+  let fastTestnetOptions = CardanoOnlyTestnetOptions $ defaultTestnetOptions
         { epochLength = 300
         , slotLength = slotLen
         , bftNodeOptions =
@@ -55,7 +56,7 @@ hprop_shutdownOnSlotSynced = H.integration . H.runFinallies . H.workspace "chair
           , defaultTestnetNodeOptions
           ]
         }
-  TC.TestnetRuntime { bftNodes = node:_ } <- cardanoTestnet fastTestnetOptions conf
+  TC.TestnetRuntime { bftNodes = node:_ } <- testnet fastTestnetOptions conf
 
   -- Wait for the node to exit
   let timeout :: Int