Review fixes

Author: Jimbo4350

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

@@ -165,9 +165,11 @@ createSPOGenesisAndFiles
   (TmpAbsolutePath tempAbsPath) =  do
   AnyShelleyBasedEra sbe <- pure cardanoNodeEra
 
-  let genesisShelleyDirAbs = takeDirectory inputGenesisShelleyFp
+  
+  let genesisShelleyDir = takeDirectory inputGenesisShelleyFp
+  
+  liftIOAnnotated $ System.createDirectoryIfMissing True genesisShelleyDir
 
-  genesisShelleyDir <- liftIOAnnotated $ System.createDirectoryIfMissing True genesisShelleyDirAbs >> pure genesisShelleyDirAbs
   let -- At least there should be a delegator per DRep
       -- otherwise some won't be representing anybody
       numStakeDelegators = max 3 (fromIntegral cardanoNumDReps) :: Int

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

@@ -139,9 +139,6 @@ execFlexAny'
   -> m (ExitCode, String, String) -- ^ exit code, stdout, stderr
 execFlexAny' execConfig pkgBin envBin arguments = GHC.withFrozenCallStack $ do
   cp <- procFlex' execConfig pkgBin envBin arguments
-  --H.annotate . ("━━━━ command ━━━━\n" <>) $ case IO.cmdspec cp of
-  --  IO.ShellCommand cmd -> cmd
-  --  IO.RawCommand cmd args -> cmd <> " " <> L.unwords (argQuote <$> args)
   liftIOAnnotated $ IO.readCreateProcessWithExitCode cp ""
 
 

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

@@ -100,7 +100,7 @@ assertExpectedSposInLedgerState output (NumPools numExpectedPools) execConfig =
       let numPoolsInLedgerState = Set.size poolSet
       unless (numPoolsInLedgerState == numExpectedPools) $
         throwString $ unlines 
-          [ "Expected number of stake pooFvls not found in ledger state"
+          [ "Expected number of stake pools not found in ledger state"
           , "Expected: ", show numExpectedPools
           , "Actual: ", show numPoolsInLedgerState
           ]

cardano-testnet/src/Testnet/Runtime.hs

@@ -153,10 +153,11 @@ startNode tp node ipv4 port _testnetMagic nodeCmd = GHC.withFrozenCallStack $ do
 
     -- The port number if it is obtained using 'H.randomPort', it is firstly bound to and then closed. The closing
     -- and release in the operating system is done asynchronously and can be slow. Here we wait until the port
-
-    isClosed <- liftIOAnnotated $ Ping.waitForPortClosed 45 0.1 port
+    
+    let portWaitTimeout = 45
+    isClosed <- liftIOAnnotated $ Ping.waitForPortClosed portWaitTimeout 0.1 port
     unless isClosed $ 
-      throwString $ "Port is still in use after 30 seconds before starting node: " <> show port 
+      throwString $ "Port is still in use after " ++ show portWaitTimeout ++ " seconds before starting node: " <> show port 
 
     (Just stdIn, _, _, hProcess, _)
       <- firstExceptT ProcessRelatedFailure $ initiateProcess

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

@@ -142,7 +142,7 @@ createTestnetEnv
 
     let producers = NodeId <$> filter (/= i) nodeIds
         topology = Defaults.defaultP2PTopology producers
-    liftIOAnnotated . LBS.writeFile  (nodeDataDir </> "topology.json") $ A.encodePretty topology
+    liftIOAnnotated . LBS.writeFile (nodeDataDir </> "topology.json") $ A.encodePretty topology
 
 -- | Starts a number of nodes, as configured by the value of the 'cardanoNodes'
 -- field in the 'CardanoTestnetOptions' argument. Regarding this field, you can either: