use 'startNode' in Shelley testcase

Author: MarcFontaine

cardano-testnet/src/Test/Runtime.hs

@@ -15,10 +15,10 @@ module Test.Runtime
   , PoolNode(..)
   , PoolNodeKeys(..)
   , Delegator(..)
+  , allNodes
   , bftSprockets
   , poolSprockets
   , poolNodeStdout
-  , poolNodeToTestnetNode
   , readNodeLoggingFormat
   ) where
 
@@ -99,9 +99,6 @@ data LeadershipSlot = LeadershipSlot
 poolNodeStdout :: PoolNode -> FilePath
 poolNodeStdout = nodeStdout . poolRuntime
 
-poolNodeToTestnetNode :: PoolNode -> TestnetNode
-poolNodeToTestnetNode (PoolNode runtime _) = TestnetNode runtime
-
 bftSprockets :: TestnetRuntime -> [Sprocket]
 bftSprockets = fmap (nodeSprocket . unTestnetNode) . bftNodes
 
@@ -113,3 +110,6 @@ readNodeLoggingFormat = \case
   "json" -> Right NodeLoggingFormatAsJson
   "text" -> Right NodeLoggingFormatAsText
   s -> Left $ "Unrecognised node logging format: " <> show s <> ".  Valid options: \"json\", \"text\""
+
+allNodes :: TestnetRuntime -> [NodeRuntime]
+allNodes tr = fmap unTestnetNode (bftNodes tr) <> fmap poolRuntime (poolNodes tr)

cardano-testnet/src/Testnet/Cardano.hs

@@ -12,7 +12,6 @@ module Testnet.Cardano
 
   , Era(..)
   , TestnetRuntime (..)
-  , allNodes
   , TestnetNode (..)
   , PaymentKeyPair(..)
 
@@ -42,7 +41,7 @@ import           Hedgehog.Extras.Stock.Time (formatIso8601, showUTCTimeSeconds)
 import           Ouroboros.Network.PeerSelection.LedgerPeers (UseLedgerAfter (..))
 import           Ouroboros.Network.PeerSelection.RelayAccessPoint (RelayAccessPoint (..))
 import           System.FilePath.Posix ((</>))
-import           Test.Runtime (NodeLoggingFormat (..), PaymentKeyPair (..), PoolNode (PoolNode),
+import           Test.Runtime as TR (NodeLoggingFormat (..), PaymentKeyPair (..), PoolNode (PoolNode),
                    PoolNodeKeys (..), TestnetNode (..), TestnetRuntime (..))
 import           Text.Read (Read)
 import           Text.Show (Show (show))
@@ -71,7 +70,6 @@ import qualified System.Directory as IO
 import qualified System.Info as OS
 import qualified Test.Assert as H
 import qualified Test.Process as H
-import qualified Test.Runtime as TR
 import qualified Testnet.Conf as H
 
 {- HLINT ignore "Reduce duplication" -}
@@ -123,9 +121,6 @@ defaultTestnetNodeOptions = TestnetNodeOptions
   { extraNodeCliArgs = []
   }
 
-allNodes :: TestnetRuntime -> [TestnetNode]
-allNodes tr = bftNodes tr <> fmap TR.poolNodeToTestnetNode (poolNodes tr)
-
 ifaceAddress :: String
 ifaceAddress = "127.0.0.1"
 

cardano-testnet/src/Testnet/Shelley.hs

@@ -12,18 +12,17 @@ module Testnet.Shelley
   , hprop_testnet_pause
   ) where
 
-import           Control.Monad (Monad(..), forever, forM_, void, (=<<), when)
+import           Control.Monad
 import           Control.Monad.IO.Class (MonadIO(liftIO))
 import           Control.Monad.Trans.Resource (MonadResource(liftResourceT), resourceForkIO)
 import           Data.Aeson (Value, ToJSON(toJSON))
 import           Data.ByteString.Lazy (ByteString)
 import           Data.Eq (Eq)
 import           Data.Function (($), (.), flip)
-import           Data.Functor (Functor(fmap), (<$>), (<&>))
+import           Data.Functor
 import           Data.Int (Int)
 import           Data.List ((\\))
-import           Data.Maybe (Maybe(Nothing, Just), fromJust)
-import           Data.Ord (Ord((<=)))
+import           Data.Maybe
 import           Data.Semigroup (Semigroup((<>)))
 import           Data.String (String, fromString)
 import           Data.Time.Clock (UTCTime)
@@ -36,6 +35,9 @@ import           Ouroboros.Network.PeerSelection.RelayAccessPoint (RelayAccessPo
 import           Prelude (Bool(..), Integer, (-))
 import           System.FilePath.Posix ((</>))
 import           Text.Show (Show(show))
+import           Test.Process (execCli_)
+import           Test.Runtime hiding (allNodes)
+import           Testnet.Utils
 
 import qualified Cardano.Node.Configuration.Topology as NonP2P
 import qualified Cardano.Node.Configuration.TopologyP2P as P2P
@@ -58,13 +60,9 @@ import qualified Hedgehog.Extras.Test.Network as H
 import qualified Hedgehog.Extras.Test.Process as H
 import qualified System.Directory as IO
 import qualified System.Info as OS
-import qualified System.IO as IO
-import qualified System.Process as IO
 import qualified Test.Base as H
 import qualified Test.Process as H
 import qualified Testnet.Conf as H
-import           Test.Runtime (TestnetRuntime (..))
-                   
 
 {- HLINT ignore "Reduce duplication" -}
 {- HLINT ignore "Redundant <&>" -}
@@ -189,7 +187,7 @@ shelleyTestnet testnetOptions H.Conf {..} = do
   liftIO $ IO.copyFile sourceAlonzoGenesisSpecFile alonzoSpecFile
 
   -- Set up our template
-  void $ H.execCli
+  execCli_
     [ "genesis", "create"
     , "--testnet-magic", show @Int testnetMagic
     , "--genesis-dir", tempAbsPath
@@ -207,7 +205,7 @@ shelleyTestnet testnetOptions H.Conf {..} = do
   H.assertIsJsonFile $ tempAbsPath </> "genesis.spec.json"
 
   -- Now generate for real
-  void $ H.execCli
+  execCli_
     [ "genesis", "create"
     , "--testnet-magic", show @Int testnetMagic
     , "--genesis-dir", tempAbsPath
@@ -221,14 +219,14 @@ shelleyTestnet testnetOptions H.Conf {..} = do
   -- Make the pool operator cold keys
   -- This was done already for the BFT nodes as part of the genesis creation
   forM_ poolNodes $ \n -> do
-    void $ H.execCli
+    execCli_
       [ "node", "key-gen"
       , "--cold-verification-key-file", tempAbsPath </> n </> "operator.vkey"
       , "--cold-signing-key-file", tempAbsPath </> n </> "operator.skey"
       , "--operational-certificate-issue-counter-file", tempAbsPath </> n </> "operator.counter"
       ]
 
-    void $ H.execCli
+    execCli_
       [ "node", "key-gen-VRF"
       , "--verification-key-file", tempAbsPath </> n </> "vrf.vkey"
       , "--signing-key-file", tempAbsPath </> n </> "vrf.skey"
@@ -243,13 +241,13 @@ shelleyTestnet testnetOptions H.Conf {..} = do
 
   --  Make hot keys and for all nodes
   forM_ allNodes $ \node -> do
-    void $ H.execCli
+    execCli_
       [ "node", "key-gen-KES"
       , "--verification-key-file", tempAbsPath </> node </> "kes.vkey"
       , "--signing-key-file", tempAbsPath </> node </> "kes.skey"
       ]
 
-    void $ H.execCli
+    execCli_
       [ "node", "issue-op-cert"
       , "--kes-period", "0"
       , "--kes-verification-key-file", tempAbsPath </> node </> "kes.vkey"
@@ -278,21 +276,21 @@ shelleyTestnet testnetOptions H.Conf {..} = do
 
   forM_ addrs $ \addr -> do
     -- Payment address keys
-    void $ H.execCli
+    execCli_
       [ "address", "key-gen"
       , "--verification-key-file", tempAbsPath </> "addresses/" <> addr <> ".vkey"
       , "--signing-key-file", tempAbsPath </> "addresses/" <> addr <> ".skey"
       ]
 
     -- Stake address keys
-    void $ H.execCli
+    execCli_
       [ "stake-address", "key-gen"
       , "--verification-key-file", tempAbsPath </> "addresses/" <> addr <> "-stake.vkey"
       , "--signing-key-file", tempAbsPath </> "addresses/" <> addr <> "-stake.skey"
       ]
 
     -- Payment addresses
-    void $ H.execCli
+    execCli_
       [ "address", "build"
       , "--payment-verification-key-file", tempAbsPath </> "addresses/" <> addr <> ".vkey"
       , "--stake-verification-key-file", tempAbsPath </> "addresses/" <> addr <> "-stake.vkey"
@@ -301,23 +299,23 @@ shelleyTestnet testnetOptions H.Conf {..} = do
       ]
 
     -- Stake addresses
-    void $ H.execCli
+    execCli_
       [ "stake-address", "build"
       , "--stake-verification-key-file", tempAbsPath </> "addresses/" <> addr <> "-stake.vkey"
       , "--testnet-magic", show @Int testnetMagic
       , "--out-file", tempAbsPath </> "addresses/" <> addr <> "-stake.addr"
       ]
 
     -- Stake addresses registration certs
-    void $ H.execCli
+    execCli_
       [ "stake-address", "registration-certificate"
       , "--stake-verification-key-file", tempAbsPath </> "addresses/" <> addr <> "-stake.vkey"
       , "--out-file", tempAbsPath </> "addresses/" <> addr <> "-stake.reg.cert"
       ]
 
   forM_ userPoolN $ \n -> do
     -- Stake address delegation certs
-    void $ H.execCli
+    execCli_
       [ "stake-address", "delegation-certificate"
       , "--stake-verification-key-file", tempAbsPath </> "addresses/user" <> n <> "-stake.vkey"
       , "--cold-verification-key-file", tempAbsPath </> "node-pool" <> n </> "operator.vkey"
@@ -333,7 +331,7 @@ shelleyTestnet testnetOptions H.Conf {..} = do
 
   -- Next is to make the stake pool registration cert
   forM_ poolNodes $ \node -> do
-    void $ H.execCli
+    execCli_
       [ "stake-pool", "registration-certificate"
       , "--testnet-magic", show @Int testnetMagic
       , "--pool-pledge", "0"
@@ -367,7 +365,7 @@ shelleyTestnet testnetOptions H.Conf {..} = do
 
     userNAddr <- H.readFile $ tempAbsPath </> "addresses/user" <> n <> ".addr"
 
-    void $ H.execCli
+    execCli_
       [ "transaction", "build-raw"
       , "--invalid-hereafter", "1000"
       , "--fee", "0"
@@ -386,7 +384,7 @@ shelleyTestnet testnetOptions H.Conf {..} = do
     -- 3. the pool n owner key, due to the pool registration cert
     -- 3. the pool n operator key, due to the pool registration cert
 
-    void $ H.execCli
+    execCli_
       [ "transaction", "sign"
       , "--signing-key-file", tempAbsPath </> "utxo-keys/utxo" <> n <> ".skey"
       , "--signing-key-file", tempAbsPath </> "addresses/user" <> n <> "-stake.skey"
@@ -409,24 +407,8 @@ shelleyTestnet testnetOptions H.Conf {..} = do
     <&> L.unlines . fmap (rewriteConfiguration (enableP2P testnetOptions)) . L.lines
     >>= H.writeFile (tempAbsPath </> "configuration.yaml")
 
-  forM_ allNodes $ \node -> do
-    dbDir <- H.noteShow $ tempAbsPath </> "db/" <> node
-    nodeStdoutFile <- H.noteTempFile logDir $ node <> ".stdout.log"
-    nodeStderrFile <- H.noteTempFile logDir $ node <> ".stderr.log"
-    sprocket <- H.noteShow $ Sprocket tempBaseAbsPath (socketDir </> node)
-
-    H.createDirectoryIfMissing dbDir
-    H.createDirectoryIfMissing $ tempBaseAbsPath </> socketDir
-
-    hNodeStdout <- H.openFile nodeStdoutFile IO.WriteMode
-    hNodeStderr <- H.openFile nodeStderrFile IO.WriteMode
-
-    H.diff (L.length (IO.sprocketArgumentName sprocket)) (<=) IO.maxSprocketArgumentNameLength
-
-    portString <- H.readFile $ tempAbsPath </> node </> "port"
-
-    void $ H.createProcess =<<
-      ( H.procNode
+  allNodeRuntimes <- forM allNodes $ \node -> do
+    runtime <- startNode socketDir tempBaseAbsPath tempAbsPath logDir node
         [ "run"
         , "--config", tempAbsPath </> "configuration.yaml"
         , "--topology", tempAbsPath </> node </> "topology.json"
@@ -435,20 +417,8 @@ shelleyTestnet testnetOptions H.Conf {..} = do
         , "--shelley-vrf-key", tempAbsPath </> node </> "vrf.skey"
         , "--shelley-operational-certificate" , tempAbsPath </> node </> "node.cert"
         , "--host-addr", ifaceAddress
-        , "--port", portString
-        , "--socket-path", IO.sprocketArgumentName sprocket
-        ] <&>
-        ( \cp -> cp
-          { IO.std_in = IO.CreatePipe
-          , IO.std_out = IO.UseHandle hNodeStdout
-          , IO.std_err = IO.UseHandle hNodeStderr
-          , IO.cwd = Just tempBaseAbsPath
-          }
-        )
-      )
-
-    when (OS.os `L.elem` ["darwin", "linux"]) $ do
-      H.onFailure . H.noteIO_ $ IO.readProcess "lsof" ["-iTCP:" <> portString, "-sTCP:LISTEN", "-n", "-P"] ""
+        ]
+    return $ TestnetNode runtime
 
   now <- H.noteShowIO DTC.getCurrentTime
   deadline <- H.noteShow $ DTC.addUTCTime 90 now
@@ -469,10 +439,9 @@ shelleyTestnet testnetOptions H.Conf {..} = do
     { configurationFile = alonzoSpecFile
     , shelleyGenesisFile = tempAbsPath </> "genesis/shelley/genesis.json"
     , testnetMagic
-  -- TODO: return some useful data here !!
     , poolNodes = [ ]
     , wallets = [ ]
-    , bftNodes = [ ]
+    , bftNodes = allNodeRuntimes
     , delegators = [ ]
     }