Merge pull request #6477 from IntersectMBO/revert-6447-testnet-run-tx-gen

Revert #6447: [cardano-testnet] Add flag to run tx-generator from cardano-testnet

Author: palas

cardano-testnet/cardano-testnet.cabal

@@ -134,7 +134,6 @@ library
                         Testnet.Start.Types
                         Testnet.SubmitApi
                         Testnet.TestQueryCmds
-                        Testnet.TxGenRuntime
                         Testnet.Types
 
   other-modules:        Parsers.Cardano

cardano-testnet/changelog.d/20260220_005344_palas_testnet_run_tx_gen.md

@@ -71,15 +71,10 @@ pCardanoTestnetCliOptions = CardanoTestnetOptions
       <>  OA.help "Enable new epoch state logging to logs/ledger-epoch-state.log"
       <>  OA.showDefault
       )
-  <*> ( OA.flag' GenerateTemplateConfigForTxGenerator
-          (   OA.long "generate-tx-generator-config"
-          <>  OA.help "Generate a template configuration file for tx-generator."
-          )
-      <|> OA.flag' GenerateAndRunTxGenerator
-          (   OA.long "run-tx-generator"
-          <>  OA.help "Generate a configuration file for tx-generator and run it."
-          )
-      <|> pure NoTxGeneratorSupport
+  <*> OA.flag NoTxGeneratorSupport GenerateTemplateConfigForTxGenerator
+      (   OA.long "generate-tx-generator-config"
+      <>  OA.help "Generate a template configuration file for tx-generator."
+      <>  OA.showDefault
       )
   <*> (maybe NoUserProvidedEnv UserProvidedEnv <$> optional (OA.strOption
       (   OA.long "output-dir"

cardano-testnet/src/Parsers/Cardano.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE NamedFieldPuns #-}
 
 #if !defined(mingw32_HOST_OS)
 #define UNIX
@@ -11,18 +12,19 @@ module Testnet.Handlers
 #ifdef UNIX
 import           Control.Monad
 import           System.Posix.Signals (Handler (..), installHandler, raiseSignal, sigINT)
-import           System.Process (interruptProcessGroupOf, ProcessHandle)
+import           System.Process (interruptProcessGroupOf)
 #endif
 
+import           Testnet.Types
+
+interruptNodesOnSigINT :: [TestnetNode] -> IO ()
 #ifdef UNIX
-interruptNodesOnSigINT :: [ProcessHandle] -> IO ()
-interruptNodesOnSigINT processHandlers =
+interruptNodesOnSigINT testnetNodes =
   -- Interrupt cardano nodes when the main process is interrupted
   void $ flip (installHandler sigINT) Nothing $ CatchOnce $ do
-    forM_ processHandlers $ \nodeProcessHandle ->
+    forM_ testnetNodes $ \TestnetNode{nodeProcessHandle} ->
       interruptProcessGroupOf nodeProcessHandle
     raiseSignal sigINT
 #else
-interruptNodesOnSigINT :: processHandle -> IO ()
 interruptNodesOnSigINT _testnetNodes = pure ()
 #endif

cardano-testnet/src/Testnet/Handlers.hs

@@ -10,7 +10,6 @@ module Testnet.Process.RunIO
   , execCli_
   , mkExecConfig
   , procNode
-  , procFlex
   , liftIOAnnotated
   ) where
 
@@ -39,6 +38,8 @@ import           Hedgehog.Extras.Test.Process (ExecConfig (..))
 
 import           RIO
 
+
+
 defaultExecConfig :: ExecConfig
 defaultExecConfig = ExecConfig
   { execConfigEnv = mempty

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

@@ -75,7 +75,6 @@ import           Testnet.Process.RunIO (execCli', execCli_, liftIOAnnotated, mkE
 import           Testnet.Property.Assert (assertExpectedSposInLedgerState)
 import           Testnet.Runtime as TR
 import           Testnet.Start.Types
-import           Testnet.TxGenRuntime (startTxGenRuntime)
 import           Testnet.Types as TR hiding (shelleyGenesis)
 
 import qualified Hedgehog.Extras as H
@@ -355,11 +354,20 @@ cardanoTestnet
     throwString $ "Some nodes failed to start:\n" ++ show (vsep $ prettyError <$> failedNodes)
 
   -- Interrupt cardano nodes when the main process is interrupted
-  liftIOAnnotated $ interruptNodesOnSigINT (map nodeProcessHandle testnetNodes')
+  liftIOAnnotated $ interruptNodesOnSigINT testnetNodes'
 
   -- Make sure that all nodes are healthy by waiting for a chain extension
   mapConcurrently_ (waitForBlockThrow 45 (File nodeConfigFile)) testnetNodes'
 
+  let node1SocketPath = tmpAbsPath </> "socket" </> "node1" </> "sock"
+      utxoSigningKeyFile = File $ (tmpAbsPath </>) $ unFile $ signingKey $ Defaults.defaultUtxoKeys 1
+      nodeDescriptions = NEL.map (\(i, port) -> NodeDescription (NodeAddress (NodeHostIPv4Address (fromHostAddress testnetDefaultIpv4Address)) port) (Defaults.defaultNodeName i) ) portNumbers
+
+  case cardanoEnableTxGenerator testnetOptions of
+    NoTxGeneratorSupport -> pure ()
+    GenerateTemplateConfigForTxGenerator ->
+      generateTxGenConfig tmpAbsPath nodeConfigFile utxoSigningKeyFile node1SocketPath nodeDescriptions
+
   let runtime = TestnetRuntime
         { configurationFile = File nodeConfigFile
         , shelleyGenesisFile = tmpAbsPath </> Defaults.defaultGenesisFilepath ShelleyEra
@@ -391,24 +399,7 @@ cardanoTestnet
   when enableNewEpochStateLogging $
     TR.startLedgerNewEpochStateLogging runtime tempBaseAbsPath
 
-  let node1SocketPath = tmpAbsPath </> "socket" </> "node1" </> "sock"
-      utxoSigningKeyFile = File $ (tmpAbsPath </>) $ unFile $ signingKey $ Defaults.defaultUtxoKeys 1
-      nodeDescriptions = NEL.map (\(i, port) -> NodeDescription (NodeAddress (NodeHostIPv4Address (fromHostAddress testnetDefaultIpv4Address)) port) (Defaults.defaultNodeName i) ) portNumbers
-
-  case cardanoEnableTxGenerator testnetOptions of
-    NoTxGeneratorSupport -> pure ()
-    GenerateTemplateConfigForTxGenerator ->
-      void $ generateTxGenConfig tmpAbsPath nodeConfigFile utxoSigningKeyFile node1SocketPath nodeDescriptions
-    GenerateAndRunTxGenerator -> do
-      configFile <- generateTxGenConfig tmpAbsPath nodeConfigFile utxoSigningKeyFile node1SocketPath nodeDescriptions
-      hProcess <- runRIO () $ startTxGenRuntime (TmpAbsolutePath tmpAbsPath)
-        [ "json_highlevel"
-        , configFile
-        ]
-      liftIOAnnotated $ interruptNodesOnSigINT (hProcess : map nodeProcessHandle testnetNodes')
-
   pure runtime
-
   where
     extraCliArgs = \case
       SpoNodeOptions args -> args
@@ -419,10 +410,9 @@ cardanoTestnet
     mkTestnetNodeKeyPaths :: Int -> SpoNodeKeys
     mkTestnetNodeKeyPaths n = makePathsAbsolute $ Defaults.defaultSpoKeys n
 
-    generateTxGenConfig :: MonadUnliftIO m => FilePath -> FilePath -> SigningKeyFile 'In -> String -> NonEmpty NodeDescription -> m FilePath
+    generateTxGenConfig :: MonadUnliftIO m => FilePath -> FilePath -> SigningKeyFile 'In -> String -> NonEmpty NodeDescription -> m ()
     generateTxGenConfig basePath nodeConfigFilePath utxoSigningKeyFile localNodeSocketPath nodeTopology = do
-      let file = basePath </> "tx-generator-config.json"
-          nixServiceOptions = NixServiceOptions {
+      let nixServiceOptions = NixServiceOptions {
             _nix_debugMode        = False
           , _nix_tx_count         = 100
           , _nix_tps              = 10
@@ -441,8 +431,8 @@ cardanoTestnet
           , _nix_localNodeSocketPath  = localNodeSocketPath
           , _nix_targetNodes          = nodeTopology
           }
-      liftIOAnnotated . LBS.writeFile file $ A.encodePretty nixServiceOptions
-      pure file
+      liftIOAnnotated . LBS.writeFile (basePath </> "tx-generator-config.json") $ A.encodePretty nixServiceOptions
+      pure ()
 
     -- wait for new blocks or throw an exception if there are none in the timeout period
     waitForBlockThrow :: MonadUnliftIO m

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

@@ -170,7 +170,6 @@ data CardanoTestnetCreateEnvOptions = CardanoTestnetCreateEnvOptions
 data TxGeneratorSupport
   = NoTxGeneratorSupport
   | GenerateTemplateConfigForTxGenerator
-  | GenerateAndRunTxGenerator
   deriving (Eq, Show)
 
 -- | Options which, contrary to 'GenesisOptions' are not implemented

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

@@ -5,7 +5,7 @@ Usage: cardano-testnet cardano [--num-pool-nodes COUNT]
   [--nodeLoggingFormat LOGGING_FORMAT]
   [--num-dreps NUMBER]
   [--enable-new-epoch-state-logging]
-  [--generate-tx-generator-config | --run-tx-generator]
+  [--generate-tx-generator-config]
   [--output-dir DIRECTORY]
   [--testnet-magic INT]
   [--epoch-length SLOTS]
@@ -21,7 +21,7 @@ Usage: cardano-testnet create-env [--num-pool-nodes COUNT]
   [--nodeLoggingFormat LOGGING_FORMAT]
   [--num-dreps NUMBER]
   [--enable-new-epoch-state-logging]
-  [--generate-tx-generator-config | --run-tx-generator]
+  [--generate-tx-generator-config]
   [--output-dir DIRECTORY]
   [--testnet-magic INT]
   [--epoch-length SLOTS]

cardano-testnet/src/Testnet/TxGenRuntime.hs

@@ -3,7 +3,7 @@ Usage: cardano-testnet cardano [--num-pool-nodes COUNT]
   [--nodeLoggingFormat LOGGING_FORMAT]
   [--num-dreps NUMBER]
   [--enable-new-epoch-state-logging]
-  [--generate-tx-generator-config | --run-tx-generator]
+  [--generate-tx-generator-config]
   [--output-dir DIRECTORY]
   [--testnet-magic INT]
   [--epoch-length SLOTS]
@@ -33,8 +33,6 @@ Available options:
   --generate-tx-generator-config
                            Generate a template configuration file for
                            tx-generator.
-  --run-tx-generator       Generate a configuration file for tx-generator and
-                           run it.
   --output-dir DIRECTORY   Directory where to store files, sockets, and so on.
                            It is created if it doesn't exist. If unset, a
                            temporary directory is used.