cardano-testnet: Clean up conf constructor naming in cardano-testnet

cardano-node-chairman/.changes/20260804_213638_palas_cleanup_conf_constructor_naming.yml

@@ -0,0 +1,6 @@
+pr: 6637
+kind:
+  - test
+description: |
+  - Adapted the chairman test to the removal of `mkConf` from `cardano-testnet`:
+    use the pure `mkConfig` instead.

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

@@ -17,7 +17,7 @@ import           Spec.Chairman.Chairman (chairmanOver)
 
 hprop_chairman :: H.Property
 hprop_chairman = integrationRetryWorkspace 2 "cardano-chairman" $ \tempAbsPath' -> H.runWithDefaultWatchdog_ $ do
-  conf <- mkConf tempAbsPath'
+  let conf = mkConfig tempAbsPath'
 
   let creationOptions = def{ creationNodes = cardanoDefaultTestnetNodesWithOptions }
   allNodes <- testnetNodes <$> createAndRunTestnet creationOptions def conf

cardano-testnet/.changes/20260804_213638_palas_cleanup_conf_constructor_naming.yml

@@ -0,0 +1,7 @@
+pr: 6637
+kind:
+  - breaking
+description: |
+  - Cleaned up the naming of the `*Conf*` constructors in `Testnet.Start.Types`:
+    - Removed `mkConf`. Its only difference with `mkConfig` was noting the path in the test log, which was redundant. Test code now uses the pure `mkConfig` directly, now exported in place of `mkConf`.
+    - Renamed `mkConfigAbs` to `mkConfigAbsolute`, and documented that, besides making the path absolute, it also creates the directory if it doesn't exist yet.

cardano-testnet/src/Cardano/Testnet.hs

@@ -25,7 +25,7 @@ module Cardano.Testnet (
   TmpAbsolutePath(..),
   NodeConfiguration,
   NodeConfigurationYaml,
-  mkConf,
+  mkConfig,
   makeLogDir,
   makeSocketDir,
   makeTmpBaseAbsPath,

cardano-testnet/src/Parsers/Run.hs

@@ -64,7 +64,7 @@ createEnvOptions CardanoTestnetCreateEnvOptions
   { createEnvCreationOptions=creationOptions
   , createEnvOutputDir=outputDir
   } = do
-      conf <- mkConfigAbs outputDir
+      conf <- mkConfigAbsolute outputDir
       void $ createTestnetEnv
         creationOptions
         -- Do not add hashes to the main config file, so that genesis files
@@ -78,7 +78,7 @@ runCardanoOptions = \case
     -- It is not necessary to update timestamps here, because
     -- the genesis files will be created with up-to-date stamps already.
     let dirName = fromMaybe "testnet" noEnvOutputDir
-    conf <- mkConfigAbs dirName
+    conf <- mkConfigAbsolute dirName
     runSimpleApp . runResourceT $ do
       logInfo $ "Creating environment: " <> display (tempAbsPath conf)
       createTestnetEnv noEnvCreationOptions conf
@@ -90,7 +90,7 @@ runCardanoOptions = \case
     -- Run cardano-testnet in the sandbox provided by the user
     let dirName = envPath fromEnvOptions
     unlessM (doesDirectoryExist dirName) $ error $ "The provided path does not exist or is not a directory: " <> dirName
-    conf <- mkConfigAbs dirName
+    conf <- mkConfigAbsolute dirName
     nodes <- readNodesWithOptionsFromEnv (unTmpAbsPath (tempAbsPath conf))
     runSimpleApp . runResourceT $ do
       logInfo $ "Starting testnet in environment: " <> display (tempAbsPath conf)

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

@@ -33,7 +33,7 @@ import           Text.Printf (printf)
 
 import           Testnet.Process.RunIO
 import           Testnet.Property.Util (integration, integrationWorkspace)
-import           Testnet.Start.Types (Conf, mkConf)
+import           Testnet.Start.Types (Conf, mkConfig)
 
 import           Testnet.Types (TestnetNode (..), TestnetRuntime (..), spoNodes)
 
@@ -109,7 +109,7 @@ testnetProperty env runTn =
   case env of
       NoUserProvidedEnv -> do
         integrationWorkspace "testnet" $ \workspaceDir -> do
-          mkConf workspaceDir >>= forkAndRunTestnet
+          forkAndRunTestnet $ mkConfig workspaceDir
       UserProvidedEnv userOutputDir ->
         integration $ do
           absUserOutputDir <- H.evalIO $ makeAbsolute userOutputDir
@@ -120,8 +120,7 @@ testnetProperty env runTn =
           else do
             liftIOAnnotated $ createDirectory absUserOutputDir
             H.note_ $ "Created " <> absUserOutputDir
-          conf <- mkConf absUserOutputDir
-          forkAndRunTestnet conf
+          forkAndRunTestnet $ mkConfig absUserOutputDir
   where
     forkAndRunTestnet conf = do
       -- Fork a thread to keep alive indefinitely any resources allocated by testnet.

cardano-testnet/src/Testnet/Start/Types.hs

@@ -44,8 +44,8 @@ module Testnet.Start.Types
   , GenesisHashesPolicy (..)
   , NodeConfiguration
   , NodeConfigurationYaml
-  , mkConf
-  , mkConfigAbs
+  , mkConfig
+  , mkConfigAbsolute
   ) where
 
 import           Cardano.Api hiding (cardanoEra)
@@ -65,16 +65,12 @@ import           Data.List.NonEmpty (NonEmpty ((:|)))
 import qualified Data.List.NonEmpty as NEL
 import qualified Data.Text as Text
 import           Data.Word
-import           GHC.Stack
 import qualified Network.HTTP.Simple as HTTP
 import           System.Directory (createDirectory, doesDirectoryExist, makeAbsolute)
 import           System.FilePath (addTrailingPathSeparator)
 
 import           Testnet.Filepath
 
-import           Hedgehog (MonadTest)
-import qualified Hedgehog.Extras as H
-
 -- | The default value for the --testnet-magic option for `cardano-testnet`
 defaultTestnetMagic :: Int
 defaultTestnetMagic = 42
@@ -323,15 +319,9 @@ data Conf = Conf
   , updateTimestamps :: UpdateTimestamps
   } deriving (Eq, Show)
 
--- |  Same as mkConfig except that it renders the path
--- when failing in a property test.
-mkConf :: (HasCallStack, MonadTest m) => FilePath -> m Conf
-mkConf tempAbsPath' = withFrozenCallStack $ do
-  H.note_ tempAbsPath'
-  pure $ mkConfig tempAbsPath'
-
 -- | Create a 'Conf' from a temporary absolute path, with Genesis Hashes enabled
--- and updating time stamps disabled.
+-- and updating time stamps disabled. This function is pure: the directory is
+-- neither created nor checked for existence.
 mkConfig :: FilePath -> Conf
 mkConfig tempAbsPath' =
   Conf
@@ -340,10 +330,10 @@ mkConfig tempAbsPath' =
     , updateTimestamps = DontUpdateTimestamps
     }
 
--- | Create a 'Conf' from an absolute path, with Genesis Hashes enabled
--- and updating time stamps disabled.
-mkConfigAbs :: FilePath -> IO Conf
-mkConfigAbs userOutputDir = do
+-- | Like 'mkConfig', except that the path is first made absolute, and the
+-- directory is created if it doesn't exist yet.
+mkConfigAbsolute :: FilePath -> IO Conf
+mkConfigAbsolute userOutputDir = do
   absUserOutputDir <-  makeAbsolute userOutputDir
   dirExists <- doesDirectoryExist absUserOutputDir
   let conf = mkConfig absUserOutputDir

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Api/TxReferenceInputDatum.hs

@@ -56,7 +56,7 @@ import qualified Hedgehog.Extras.Test.TestWatchdog as H
 -- This test tests that such datums are made available to the script.
 hprop_tx_refin_datum :: Property
 hprop_tx_refin_datum = integrationRetryWorkspace 2 "api-tx-refin-dat" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
-  conf@Conf{tempAbsPath} <- mkConf tempAbsBasePath'
+  let conf@Conf{tempAbsPath} = mkConfig tempAbsBasePath'
   let tempAbsPath' = unTmpAbsPath tempAbsPath
 
   let era = Exp.ConwayEra

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Conway/StakeSnapshot.hs

@@ -32,7 +32,7 @@ import qualified Hedgehog.Extras.Test.TestWatchdog as H
 hprop_stakeSnapshot :: Property
 hprop_stakeSnapshot = integrationRetryWorkspace 2 "conway-stake-snapshot" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
   H.note_ SYS.os
-  conf@Conf { tempAbsPath } <- mkConf tempAbsBasePath'
+  let conf@Conf { tempAbsPath } = mkConfig tempAbsBasePath'
   let tempAbsPath' = unTmpAbsPath tempAbsPath
       tempBaseAbsPath = makeTmpBaseAbsPath $ TmpAbsolutePath tempAbsPath'
 

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

@@ -61,9 +61,8 @@ import qualified Hedgehog.Extras.Test.TestWatchdog as H
 hprop_kes_period_info :: Property
 hprop_kes_period_info = integrationRetryWorkspace 2 "kes-period-info" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
   H.note_ SYS.os
-  conf@Conf { tempAbsPath=tempAbsPath@(TmpAbsolutePath work) }
-    -- TODO: Move yaml filepath specification into individual node options
-    <- mkConf tempAbsBasePath'
+  -- TODO: Move yaml filepath specification into individual node options
+  let conf@Conf { tempAbsPath=tempAbsPath@(TmpAbsolutePath work) } = mkConfig tempAbsBasePath'
 
   let tempBaseAbsPath = makeTmpBaseAbsPath tempAbsPath
       ceo = ConwayEraOnwardsConway

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/LeadershipSchedule.hs

@@ -64,7 +64,7 @@ import qualified Hedgehog.Extras.Test.TestWatchdog as H
 hprop_leadershipSchedule :: Property
 hprop_leadershipSchedule = integrationRetryWorkspace 2 "leadership-schedule" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
   H.note_ SYS.os
-  conf@Conf { tempAbsPath=tempAbsPath@(TmpAbsolutePath work) } <- mkConf tempAbsBasePath'
+  let conf@Conf { tempAbsPath=tempAbsPath@(TmpAbsolutePath work) } = mkConfig tempAbsBasePath'
   let tempBaseAbsPath = makeTmpBaseAbsPath tempAbsPath
       ceo = ConwayEraOnwardsConway
       sbe = convert ceo

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/BuildRaw.hs

@@ -44,7 +44,7 @@ import qualified Hedgehog.Extras.Test.TestWatchdog as H
 hprop_build_raw_ref_script_spend :: Property
 hprop_build_raw_ref_script_spend = integrationRetryWorkspace 2 "build-raw-ref-script" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
     H.note_ SYS.os
-    conf@Conf{tempAbsPath} <- mkConf tempAbsBasePath'
+    let conf@Conf{tempAbsPath} = mkConfig tempAbsBasePath'
     let tempAbsPath' = unTmpAbsPath tempAbsPath
     work <- H.createDirectoryIfMissing $ tempAbsPath' </> "work"
 

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/CostCalculation.hs

@@ -57,7 +57,7 @@ import qualified Hedgehog.Extras.Test.TestWatchdog as H
 hprop_ref_plutus_cost_calculation :: Property
 hprop_ref_plutus_cost_calculation = integrationRetryWorkspace 2 "ref-plutus-script" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
   H.note_ SYS.os
-  conf@Conf{tempAbsPath} <- mkConf tempAbsBasePath'
+  let conf@Conf{tempAbsPath} = mkConfig tempAbsBasePath'
   let tempAbsPath' = unTmpAbsPath tempAbsPath
   work <- H.createDirectoryIfMissing $ tempAbsPath' </> "work"
 
@@ -213,7 +213,7 @@ hprop_ref_plutus_cost_calculation = integrationRetryWorkspace 2 "ref-plutus-scri
 hprop_included_plutus_cost_calculation :: Property
 hprop_included_plutus_cost_calculation = integrationRetryWorkspace 2 "included-plutus-script" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
   H.note_ SYS.os
-  conf@Conf{tempAbsPath} <- mkConf tempAbsBasePath'
+  let conf@Conf{tempAbsPath} = mkConfig tempAbsBasePath'
   let tempAbsPath' = unTmpAbsPath tempAbsPath
   work <- H.createDirectoryIfMissing $ tempAbsPath' </> "work"
 
@@ -325,7 +325,7 @@ hprop_included_plutus_cost_calculation = integrationRetryWorkspace 2 "included-p
 hprop_included_simple_script_cost_calculation :: Property
 hprop_included_simple_script_cost_calculation = integrationRetryWorkspace 2 "included-simple-script" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
   H.note_ SYS.os
-  conf@Conf{tempAbsPath} <- mkConf tempAbsBasePath'
+  let conf@Conf{tempAbsPath} = mkConfig tempAbsBasePath'
   let tempAbsPath' = unTmpAbsPath tempAbsPath
   work <- H.createDirectoryIfMissing $ tempAbsPath' </> "work"
 

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/MultiAssetReturnCollateral.hs

@@ -36,7 +36,7 @@ import qualified Hedgehog.Extras as H
 -- @DISABLE_RETRIES=1 cabal test cardano-testnet-test --test-options '-p "/Collateral With Multiassets/"'@
 hprop_collateral_with_tokens :: Property
 hprop_collateral_with_tokens = integrationRetryWorkspace 2 "collateral-with-tokens" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
-  conf@Conf { tempAbsPath } <- mkConf tempAbsBasePath'
+  let conf@Conf { tempAbsPath } = mkConfig tempAbsBasePath'
   let tempAbsPath' = unTmpAbsPath tempAbsPath
   work <- H.createDirectoryIfMissing $ tempAbsPath' </> "work"
 

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/Scripts.hs

@@ -48,7 +48,7 @@ import qualified Hedgehog.Extras as H
 -- @DISABLE_RETRIES=1 cabal test cardano-testnet-test --test-options '-p "/PlutusV3 purposes/"'@
 hprop_plutus_purposes_v3 :: Property
 hprop_plutus_purposes_v3 = integrationRetryWorkspace 2 "all-plutus-script-purposes" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
-  conf@Conf { tempAbsPath } <- mkConf tempAbsBasePath'
+  let conf@Conf { tempAbsPath } = mkConfig tempAbsBasePath'
   let tempAbsPath' = unTmpAbsPath tempAbsPath
   work <- H.createDirectoryIfMissing $ tempAbsPath' </> "work"
 
@@ -198,7 +198,7 @@ hprop_plutus_purposes_v3 = integrationRetryWorkspace 2 "all-plutus-script-purpos
 -- @DISABLE_RETRIES=1 cabal test cardano-testnet-test --test-options '-p "/PlutusV2 transaction with two script certs/"'@
 hprop_tx_two_script_certs_v2 :: Property
 hprop_tx_two_script_certs_v2 = integrationRetryWorkspace 2 "tx-2-script-certs" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
-  conf@Conf { tempAbsPath } <- mkConf tempAbsBasePath'
+  let conf@Conf { tempAbsPath } = mkConfig tempAbsBasePath'
   let tempAbsPath' = unTmpAbsPath tempAbsPath
   work <- H.createDirectoryIfMissing $ tempAbsPath' </> "work"
 

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs

@@ -78,8 +78,7 @@ import           RIO (runRIO)
 -- RECREATE_GOLDEN_FILES=1 as its prefix
 hprop_cli_queries :: Property
 hprop_cli_queries = integrationRetryWorkspace 2 "cli-queries" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
-  conf@Conf { tempAbsPath=tempAbsPath@(TmpAbsolutePath work) }
-    <- mkConf tempAbsBasePath'
+  let conf@Conf { tempAbsPath=tempAbsPath@(TmpAbsolutePath work) } = mkConfig tempAbsBasePath'
   let tempBaseAbsPath = makeTmpBaseAbsPath tempAbsPath
 
   let sbe = ShelleyBasedEraConway

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/QuerySlotNumber.hs

@@ -40,7 +40,7 @@ import qualified Hedgehog.Internal.Property as H
 hprop_querySlotNumber :: Property
 hprop_querySlotNumber = integrationRetryWorkspace 2 "query-slot-number" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
   H.note_ SYS.os
-  conf <- mkConf tempAbsBasePath'
+  let conf = mkConfig tempAbsBasePath'
 
   let tempBaseAbsPath' = makeTmpBaseAbsPath $ tempAbsPath conf
 

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Scripts/Simple/CostCalculation.hs

@@ -42,7 +42,7 @@ import qualified Hedgehog.Extras.Test.TestWatchdog as H
 hprop_ref_simple_script_mint :: Property
 hprop_ref_simple_script_mint = integrationRetryWorkspace 2 "ref-simple-script" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
   H.note_ SYS.os
-  conf@Conf{tempAbsPath} <- mkConf tempAbsBasePath'
+  let conf@Conf{tempAbsPath} = mkConfig tempAbsBasePath'
   let tempAbsPath' = unTmpAbsPath tempAbsPath
   work <- H.createDirectoryIfMissing $ tempAbsPath' </> "work"
 

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Scripts/Simple/Mint.hs

@@ -39,7 +39,7 @@ import qualified Hedgehog.Extras as H
 -- @DISABLE_RETRIES=1 cabal test cardano-testnet-test --test-options '-p "/Simple Script.Simple Script Mint/"'@
 hprop_simple_script_mint :: Property
 hprop_simple_script_mint = integrationRetryWorkspace 2 "simple-script-mint" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
-  conf@Conf { tempAbsPath } <- mkConf tempAbsBasePath'
+  let conf@Conf { tempAbsPath } = mkConfig tempAbsBasePath'
   let tempAbsPath' = unTmpAbsPath tempAbsPath
   work <- H.createDirectoryIfMissing $ tempAbsPath' </> "work"
 

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/StakeSnapshot.hs

@@ -33,7 +33,7 @@ import qualified Hedgehog.Extras.Test.TestWatchdog as H
 hprop_stakeSnapshot :: Property
 hprop_stakeSnapshot = integrationRetryWorkspace 2 "stake-snapshot" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
   H.note_ SYS.os
-  conf@Conf { tempAbsPath } <- mkConf tempAbsBasePath'
+  let conf@Conf { tempAbsPath } = mkConfig tempAbsBasePath'
   let tempAbsPath' = unTmpAbsPath tempAbsPath
       tempBaseAbsPath = makeTmpBaseAbsPath $ TmpAbsolutePath tempAbsPath'
 

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction.hs

@@ -45,7 +45,7 @@ import qualified Hedgehog.Extras.Test.TestWatchdog as H
 hprop_transaction :: Property
 hprop_transaction = integrationRetryWorkspace 2 "simple transaction build" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
   H.note_ SYS.os
-  conf@Conf { tempAbsPath } <- mkConf tempAbsBasePath'
+  let conf@Conf { tempAbsPath } = mkConfig tempAbsBasePath'
   let tempAbsPath' = unTmpAbsPath tempAbsPath
   work <- H.createDirectoryIfMissing $ tempAbsPath' </> "work"
 

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction/BuildEstimate.hs

@@ -40,7 +40,7 @@ import qualified Hedgehog.Extras as H
 hprop_tx_build_estimate :: Property
 hprop_tx_build_estimate = integrationRetryWorkspace 2 "transaction-build-estimate" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
   -- Start a local test net
-  conf@Conf { tempAbsPath } <- mkConf tempAbsBasePath'
+  let conf@Conf { tempAbsPath } = mkConfig tempAbsBasePath'
   let tempAbsPath' = unTmpAbsPath tempAbsPath
       tempBaseAbsPath = makeTmpBaseAbsPath tempAbsPath
 

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction/RegisterDeregisterStakeAddress.hs

@@ -43,7 +43,7 @@ import qualified Hedgehog.Extras as H
 hprop_tx_register_deregister_stake_address :: Property
 hprop_tx_register_deregister_stake_address = integrationRetryWorkspace 2 "register-deregister-stake-addr" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
   -- Start a local test net
-  conf@Conf { tempAbsPath } <- mkConf tempAbsBasePath'
+  let conf@Conf { tempAbsPath } = mkConfig tempAbsBasePath'
   let tempAbsPath' = unTmpAbsPath tempAbsPath
       tempBaseAbsPath = makeTmpBaseAbsPath tempAbsPath
 

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction/WithdrawalReward.hs

@@ -52,7 +52,7 @@ import qualified Hedgehog.Extras as H
 -- @DISABLE_RETRIES=1 cabal test cardano-testnet-test --test-options '-p "/transaction build with withdrawal/"'@
 hprop_tx_withdrawal_reward :: Property
 hprop_tx_withdrawal_reward = integrationRetryWorkspace 2 "tx-withdrawal-reward" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
-  conf@Conf { tempAbsPath } <- mkConf tempAbsBasePath'
+  let conf@Conf { tempAbsPath } = mkConfig tempAbsBasePath'
   let tempAbsPath' = unTmpAbsPath tempAbsPath
       tempBaseAbsPath = makeTmpBaseAbsPath tempAbsPath
 
@@ -127,7 +127,7 @@ hprop_tx_withdrawal_reward = integrationRetryWorkspace 2 "tx-withdrawal-reward"
 -- @DISABLE_RETRIES=1 cabal test cardano-testnet-test --test-options '-p "/transaction build with plutus withdrawal/"'@
 hprop_tx_withdrawal_reward_plutus_v3 :: Property
 hprop_tx_withdrawal_reward_plutus_v3 = integrationRetryWorkspace 2 "tx-withdrawal-reward-plutus-v3" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
-  conf@Conf { tempAbsPath } <- mkConf tempAbsBasePath'
+  let conf@Conf { tempAbsPath } = mkConfig tempAbsBasePath'
   let tempAbsPath' = unTmpAbsPath tempAbsPath
       tempBaseAbsPath = makeTmpBaseAbsPath tempAbsPath
 

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/DumpConfig.hs

@@ -41,7 +41,7 @@ hprop_dump_config = integrationRetryWorkspace 2 "dump-config-files" $ \tmpDir ->
       shelleyGenesisFile = tmpDir </> "shelley-genesis.json"
 
   -- Generate the sandbox
-  conf <- mkConf tmpDir
+  let conf = mkConfig tmpDir
 
   liftToIntegration $ createTestnetEnv
     creationOptions

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/FoldEpochState.hs

@@ -26,7 +26,7 @@ import qualified Hedgehog.Extras.Test as H
 
 prop_foldEpochState :: H.Property
 prop_foldEpochState = integrationRetryWorkspace 2 "foldEpochState" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
-  conf <- TN.mkConf tempAbsBasePath'
+  let conf = TN.mkConfig tempAbsBasePath'
 
   let tempAbsPath' = unTmpAbsPath $ tempAbsPath conf
       sbe = ShelleyBasedEraConway

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/CommitteeAddNew.hs

@@ -59,7 +59,7 @@ import qualified Hedgehog.Extras as H
 -- @DISABLE_RETRIES=1 cabal test cardano-testnet-test --test-options '-p "/Committee Add New/"'@
 hprop_constitutional_committee_add_new :: Property
 hprop_constitutional_committee_add_new = integrationRetryWorkspace 2 "constitutional-committee-add-new" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
-  conf@Conf { tempAbsPath } <- mkConf tempAbsBasePath'
+  let conf@Conf { tempAbsPath } = mkConfig tempAbsBasePath'
   let tempAbsPath' = unTmpAbsPath tempAbsPath
       tempBaseAbsPath = makeTmpBaseAbsPath tempAbsPath
 

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepActivity.hs

@@ -53,7 +53,7 @@ import qualified Hedgehog.Extras as H
 hprop_check_drep_activity :: Property
 hprop_check_drep_activity = integrationRetryWorkspace 2 "test-activity" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog $ \watchdog -> do
   -- Start a local test net
-  conf@Conf { tempAbsPath } <- mkConf tempAbsBasePath'
+  let conf@Conf { tempAbsPath } = mkConfig tempAbsBasePath'
   let tempAbsPath' = unTmpAbsPath tempAbsPath
       tempBaseAbsPath = makeTmpBaseAbsPath tempAbsPath
 

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepDeposit.hs

@@ -36,7 +36,7 @@ hprop_ledger_events_drep_deposits :: Property
 hprop_ledger_events_drep_deposits = integrationRetryWorkspace 2 "drep-deposits" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
 
 
-  conf@Conf { tempAbsPath } <- mkConf tempAbsBasePath'
+  let conf@Conf { tempAbsPath } = mkConfig tempAbsBasePath'
   let tempAbsPath' = unTmpAbsPath tempAbsPath
       tempBaseAbsPath = makeTmpBaseAbsPath tempAbsPath
 

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepRetirement.hs

@@ -43,7 +43,7 @@ sbe = ShelleyBasedEraConway
 hprop_drep_retirement :: Property
 hprop_drep_retirement = integrationRetryWorkspace 2 "drep-retirement" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
   -- Start a local test net
-  conf@Conf { tempAbsPath } <- H.noteShowM $ mkConf tempAbsBasePath'
+  conf@Conf { tempAbsPath } <- H.noteShow $ mkConfig tempAbsBasePath'
   let tempAbsPath' = unTmpAbsPath tempAbsPath
       tempBaseAbsPath = makeTmpBaseAbsPath tempAbsPath