Sanity check works!

Author: Jimbo4350

cabal.project

@@ -35,8 +35,8 @@ packages:
 -- Needed when cross compiling
 extra-packages: alex
 
-program-options
-  ghc-options: -Werror
+-- program-options
+--   ghc-options: -Werror
 
 test-show-details: direct
 

cardano-node/src/Cardano/Node/Protocol/Byron.hs

@@ -36,6 +36,7 @@ import           Cardano.Tracing.OrphanInstances.Shelley ()
 import           Ouroboros.Consensus.Cardano
 import qualified Ouroboros.Consensus.Cardano as Consensus
 
+import           Control.Exception
 import qualified Data.ByteString.Lazy as LB
 import           Data.Maybe (fromMaybe)
 import           Data.Text (Text)
@@ -167,6 +168,9 @@ data ByronProtocolInstantiationError =
   | SigningKeyFilepathNotSpecified
   deriving Show
 
+instance Exception ByronProtocolInstantiationError where 
+  displayException = docToString . prettyError
+
 instance Error ByronProtocolInstantiationError where
   prettyError (CanonicalDecodeFailure fp failure) =
         "Canonical decode failure in " <> pshow fp

cardano-testnet/cardano-testnet.cabal

@@ -86,6 +86,8 @@ library
                       , process
                       , resourcet
                       , retry
+                      , rio
+                      , rio-orphans
                       , safe-exceptions
                       , scientific
                       , si-timers
@@ -98,6 +100,7 @@ library
                       , time
                       , transformers
                       , transformers-except
+                      , unliftio-core
                       , vector
                       , yaml
 
@@ -111,17 +114,20 @@ library
                         Testnet.EpochStateProcessing
                         Testnet.Filepath
                         Testnet.Handlers
+                        Testnet.Orphans
                         Testnet.Ping
                         Testnet.Process.Cli.DRep
                         Testnet.Process.Cli.Keys
                         Testnet.Process.Cli.SPO
                         Testnet.Process.Cli.Transaction
+                        Testnet.Process.NewRun
                         Testnet.Process.Run
                         Testnet.Property.Assert
                         Testnet.Property.Run
                         Testnet.Property.Util
                         Testnet.Runtime
                         Testnet.Start.Byron
+                        Testnet.Start.Cardano
                         Testnet.Start.Types
                         Testnet.SubmitApi
                         Testnet.TestQueryCmds
@@ -130,7 +136,6 @@ library
   other-modules:        Parsers.Cardano
                         Parsers.Help
                         Parsers.Version
-                        Testnet.Start.Cardano
                         Testnet.TestEnumGenerator
                         Paths_cardano_testnet
 
@@ -266,6 +271,7 @@ test-suite cardano-testnet-test
                       , mtl
                       , process
                       , regex-compat
+                      , resourcet
                       , rio
                       , tasty ^>= 1.5
                       , text

cardano-testnet/src/Parsers/Run.hs

@@ -1,6 +1,5 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
 module Parsers.Run
@@ -11,12 +10,16 @@ module Parsers.Run
   ) where
 
 import           Cardano.CLI.Environment
+import           Control.Monad
+import           Control.Monad.Trans.Class (lift)
+import           Control.Monad.Trans.Resource (getInternalState)
 
 import           Data.Default.Class (def)
 import           Data.Foldable
 import           Options.Applicative
 import qualified Options.Applicative as Opt
-
+import           RIO (runRIO)
+import           RIO.Orphans 
 import           Testnet.Property.Run
 import           Testnet.Start.Cardano
 import           Testnet.Start.Types
@@ -61,34 +64,36 @@ createEnvOptions CardanoTestnetCreateEnvOptions
   , createEnvOutputDir=outputDir
   , createEnvCreateEnvOptions=ceOptions
   } =
-    testnetRoutine (UserProvidedEnv outputDir) $ \conf -> do
-      createTestnetEnv
-        testnetOptions genesisOptions ceOptions
-        -- Do not add hashes to the main config file, so that genesis files
-        -- can be modified without having to recompute hashes every time.
-        conf{genesisHashesPolicy = WithoutHashes}
+    testnetRoutine (UserProvidedEnv outputDir) $ \conf -> do 
+      r <- lift $ lift getInternalState 
+      liftToIntegration r $
+        createTestnetEnv
+          testnetOptions genesisOptions ceOptions
+          -- Do not add hashes to the main config file, so that genesis files
+          -- can be modified without having to recompute hashes every time.
+          conf{genesisHashesPolicy = WithoutHashes}
 
 runCardanoOptions :: CardanoTestnetCliOptions -> IO ()
 runCardanoOptions CardanoTestnetCliOptions
-  { cliTestnetOptions=testnetOptions@CardanoTestnetOptions{cardanoOutputDir}
+  { cliTestnetOptions=testnetOptions
   , cliGenesisOptions=genesisOptions
   , cliNodeEnvironment=env
-  , cliUpdateTimestamps=updateTimestamps
+  , cliUpdateTimestamps=updateTimestamps'
   } =
     case env of
-      NoUserProvidedEnv ->
+      NoUserProvidedEnv -> do
         -- Create the sandbox, then run cardano-testnet.
         -- It is not necessary to honor `cliUpdateTimestamps` here, because
         -- the genesis files will be created with up-to-date stamps already.
-        runTestnet cardanoOutputDir $ \conf -> do
-          createTestnetEnv
-            testnetOptions genesisOptions def
-            conf
-          cardanoTestnet testnetOptions conf
-      UserProvidedEnv nodeEnvPath ->
+        conf <- mkConfigAbs "testnet"
+        runRIO () $ createTestnetEnv
+                   testnetOptions genesisOptions def
+                   conf
+        withResourceMap (\rm -> void . runRIO rm $ cardanoTestnet testnetOptions conf)
+      UserProvidedEnv nodeEnvPath -> do
         -- Run cardano-testnet in the sandbox provided by the user
         -- In that case, 'cardanoOutputDir' is not used
-        runTestnet (UserProvidedEnv nodeEnvPath) $ \conf ->
-          cardanoTestnet
+        conf <- mkConfigAbs nodeEnvPath
+        withResourceMap (\rm -> void . runRIO rm $ cardanoTestnet
             testnetOptions
-            conf{updateTimestamps=updateTimestamps}
+            conf{updateTimestamps=updateTimestamps'})