upd testnet integration

Author: carbolymer

cardano-testnet/src/Cardano/Testnet.hs

@@ -11,6 +11,7 @@ module Cardano.Testnet (
 
   -- ** Testnet options
   CardanoTestnetOptions(..),
+  RpcSupport(..),
   NodeOption(..),
   cardanoDefaultTestnetNodeOptions,
   getDefaultAlonzoGenesis,

cardano-testnet/src/Parsers/Cardano.hs

@@ -83,7 +83,7 @@ pCardanoTestnetCliOptions = CardanoTestnetOptions
       <>  OA.help "Directory where to store files, sockets, and so on. It is created if it doesn't exist. If unset, a temporary directory is used."
       <>  OA.metavar "DIRECTORY"
       )))
-  <*> OA.switch
+  <*> OA.flag RpcDisabled RpcEnabled
       (   OA.long "enable-grpc"
       <>  OA.help "[EXPERIMENTAL] Enable gRPC endpoint on all of testnet nodes. The listening socket file will be the same directory as node's N2C socket."
       <>  OA.showDefault

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

@@ -347,7 +347,7 @@ cardanoTestnet
         ]
         <> spoNodeCliArgs
         <> extraCliArgs nodeOptions
-        <> ["--grpc-enable" | cardanoEnableRpc]
+        <> ["--grpc-enable" | RpcEnabled <- [cardanoEnableRpc]]
     pure $ eRuntime <&> \rt -> rt{poolKeys=mKeys}
 
   let (failedNodes, testnetNodes') = partitionEithers (NEL.toList eTestnetNodes)

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

@@ -16,6 +16,7 @@ module Testnet.Start.Types
   , NumPools(..)
   , NumRelays(..)
   , TxGeneratorSupport(..)
+  , RpcSupport(..)
   , cardanoNumPools
   , cardanoNumRelays
 
@@ -175,6 +176,11 @@ data TxGeneratorSupport
   | GenerateTemplateConfigForTxGenerator
   deriving (Eq, Show)
 
+data RpcSupport
+  = RpcDisabled
+  | RpcEnabled
+  deriving (Eq, Show)
+
 -- | Options which, contrary to 'GenesisOptions' are not implemented
 -- by tuning the genesis files.
 data CardanoTestnetOptions = CardanoTestnetOptions
@@ -188,8 +194,8 @@ data CardanoTestnetOptions = CardanoTestnetOptions
   , cardanoEnableNewEpochStateLogging :: Bool -- ^ if epoch state logging is enabled
   , cardanoEnableTxGenerator :: TxGeneratorSupport -- ^ Options regarding support for the tx-generator on the testnet (config generation, execution, etc.)
   , cardanoOutputDir :: UserProvidedEnv -- ^ The output directory where to store files, sockets, and so on. If unset, a temporary directory is used.
-  , cardanoEnableRpc :: Bool
-  -- ^ True to enable gRPC endpoints in all testnet nodes
+  , cardanoEnableRpc :: RpcSupport
+  -- ^ Whether to enable gRPC endpoints in all testnet nodes
   } deriving (Eq, Show)
 
 -- | Path to the configuration file of the node, specified by the user
@@ -226,7 +232,7 @@ instance Default CardanoTestnetOptions where
     , cardanoEnableNewEpochStateLogging = True
     , cardanoEnableTxGenerator = NoTxGeneratorSupport
     , cardanoOutputDir = def
-    , cardanoEnableRpc = False
+    , cardanoEnableRpc = RpcDisabled
     }
 
 -- | Options that are implemented by writing fields in the Shelley genesis file.

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

@@ -54,7 +54,7 @@ hprop_rpc_query_pparams = integrationRetryWorkspace 2 "rpc-query-pparams" $ \tem
   let ceo = ConwayEraOnwardsConway
       sbe = convert ceo
       eraName = eraToString sbe
-      options = def{cardanoNodeEra = AnyShelleyBasedEra sbe, cardanoEnableRpc = True}
+      options = def{cardanoNodeEra = AnyShelleyBasedEra sbe, cardanoEnableRpc = RpcEnabled}
 
   TestnetRuntime
     { testnetMagic

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

@@ -50,7 +50,7 @@ hprop_rpc_transaction = integrationRetryWorkspace 2 "rpc-tx" $ \tempAbsBasePath'
   let (ceo, eraProxy) =
         (conwayBasedEra, asType) :: era ~ ConwayEra => (ConwayEraOnwards era, AsType era)
       sbe = convert ceo
-      options = def{cardanoNodeEra = AnyShelleyBasedEra sbe, cardanoEnableRpc = True}
+      options = def{cardanoNodeEra = AnyShelleyBasedEra sbe, cardanoEnableRpc = RpcEnabled}
       addrInEra = AsAddressInEra eraProxy
 
   TestnetRuntime