Review changes

IntersectMBO · Jun 5, 2023 · fc797fd · fc797fd
1 parent 645f5f7
commit fc797fd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/cardano-testnet/src/Testnet/Babbage.hs b/cardano-testnet/src/Testnet/Babbage.hs
@@ -18,6 +18,7 @@ import           Prelude
 
 import           Control.Monad
 import           Data.Aeson (Value (..), encode, object, toJSON, (.=))
+import           Data.Bifunctor
 import qualified Data.ByteString.Lazy as LBS
 import qualified Data.HashMap.Lazy as HM
 import qualified Data.List as L
@@ -73,9 +74,8 @@ babbageTestnet testnetOptions H.Conf {..} = do
   -- SPOs in the ShelleyGenesis
 
   alonzoBabbageTestGenesisJsonTargetFile <- H.noteShow $ tempAbsPath </> "genesis.alonzo.spec.json"
-  case defaultAlonzoGenesis of
-    Left e -> H.onFailure . H.noteIO_ . return $ displayError e
-    Right gen -> H.evalIO $ LBS.writeFile alonzoBabbageTestGenesisJsonTargetFile $ encode gen
+  gen <- H.evalEither $ first displayError defaultAlonzoGenesis
+  H.evalIO $ LBS.writeFile alonzoBabbageTestGenesisJsonTargetFile $ encode gen
 
   conwayBabbageTestGenesisJsonTargetFile <- H.noteShow $ tempAbsPath </> "genesis.conway.spec.json"
   H.evalIO $ LBS.writeFile conwayBabbageTestGenesisJsonTargetFile $ encode defaultConwayGenesis

diff --git a/cardano-testnet/src/Testnet/Cardano.hs b/cardano-testnet/src/Testnet/Cardano.hs
@@ -26,6 +26,7 @@ import           Cardano.Api hiding (cardanoEra)
 
 import           Control.Monad
 import qualified Data.Aeson as J
+import           Data.Bifunctor
 import qualified Data.ByteString.Lazy as LBS
 import qualified Data.HashMap.Lazy as HM
 import           Data.List ((\\))
@@ -318,9 +319,8 @@ cardanoTestnet testnetOptions H.Conf {..} = do
   shelleyDir <- H.createDirectoryIfMissing $ tempAbsPath </> "shelley"
 
   alonzoSpecFile <- H.noteTempFile tempAbsPath "shelley/genesis.alonzo.spec.json"
-  case defaultAlonzoGenesis of
-    Left e -> H.onFailure . H.noteIO_ . return $ displayError e
-    Right gen -> H.evalIO $ LBS.writeFile alonzoSpecFile $ J.encode gen
+  gen <- H.evalEither $ first displayError defaultAlonzoGenesis
+  H.evalIO $ LBS.writeFile alonzoSpecFile $ J.encode gen
 
 
   conwaySpecFile <- H.noteTempFile tempAbsPath "shelley/genesis.conway.spec.json"

diff --git a/cardano-testnet/src/Testnet/Shelley.hs b/cardano-testnet/src/Testnet/Shelley.hs
@@ -19,6 +19,7 @@ import           Control.Monad
 import           Control.Monad.IO.Class (MonadIO (liftIO))
 import           Control.Monad.Trans.Resource (MonadResource (liftResourceT), resourceForkIO)
 import           Data.Aeson (ToJSON (toJSON), Value)
+import           Data.Bifunctor
 import           Data.ByteString.Lazy (ByteString)
 import qualified Data.ByteString.Lazy as LBS
 import           Data.List ((\\))
@@ -172,9 +173,8 @@ shelleyTestnet testnetOptions H.Conf {..} = do
   let addrs = userAddrs <> poolAddrs
 
   alonzoSpecFile <- H.noteTempFile tempAbsPath "genesis.alonzo.spec.json"
-  case defaultAlonzoGenesis of
-    Left e -> H.onFailure . H.noteIO_ . return $ displayError e
-    Right gen -> H.evalIO $ LBS.writeFile alonzoSpecFile $ J.encode gen
+  gen <- H.evalEither $ first displayError defaultAlonzoGenesis
+  H.evalIO $ LBS.writeFile alonzoSpecFile $ J.encode gen
 
 
   conwaySpecFile <- H.noteTempFile tempAbsPath "genesis.conway.spec.json"

diff --git a/cardano-testnet/test/cardano-testnet-test/Test/Node/Shutdown.hs b/cardano-testnet/test/cardano-testnet-test/Test/Node/Shutdown.hs
@@ -10,6 +10,7 @@ module Test.Node.Shutdown
 import           Cardano.Api
 import           Control.Monad
 import           Data.Aeson
+import           Data.Bifunctor
 import qualified Data.ByteString.Lazy as LBS
 import           Data.Functor ((<&>))
 import qualified Data.List as L
@@ -80,9 +81,8 @@ hprop_shutdown = H.integrationRetryWorkspace 2 "shutdown" $ \tempAbsBasePath' ->
 
   -- 2. Create Alonzo genesis
   alonzoBabbageTestGenesisJsonTargetFile <- H.noteShow $ tempAbsPath' </> shelleyDir </> "genesis.alonzo.spec.json"
-  case defaultAlonzoGenesis of
-    Left e -> H.onFailure . H.noteIO_ . return $ displayError e
-    Right gen -> H.evalIO $ LBS.writeFile alonzoBabbageTestGenesisJsonTargetFile $ encode gen
+  gen <- H.evalEither $ first displayError defaultAlonzoGenesis
+  H.evalIO $ LBS.writeFile alonzoBabbageTestGenesisJsonTargetFile $ encode gen
 
   -- 2. Create Conway genesis
   conwayBabbageTestGenesisJsonTargetFile <- H.noteShow $ tempAbsPath' </> shelleyDir </> "genesis.conway.spec.json"