Update for cardano-api#945

Author: carbolymer

bench/locli/locli.cabal

@@ -212,7 +212,7 @@ test-suite test-locli
   build-depends:        cardano-prelude
                       , containers
                       , hedgehog
-                      , hedgehog-extras ^>= 0.8
+                      , hedgehog-extras ^>= 0.10
                       , locli
                       , text
 

cardano-node-chairman/cardano-node-chairman.cabal

@@ -75,7 +75,7 @@ test-suite chairman-tests
                       , data-default-class
                       , filepath
                       , hedgehog
-                      , hedgehog-extras ^>= 0.8
+                      , hedgehog-extras ^>= 0.10
                       , network
                       , process
                       , random

cardano-node/cardano-node.cabal

@@ -268,7 +268,7 @@ test-suite cardano-node-test
                       , filepath
                       , hedgehog
                       , hedgehog-corpus
-                      , hedgehog-extras ^>= 0.8
+                      , hedgehog-extras ^>= 0.10
                       , iproute
                       , mtl
                       , ouroboros-consensus

cardano-testnet/cardano-testnet.cabal

@@ -71,7 +71,7 @@ library
                       , extra
                       , filepath
                       , hedgehog
-                      , hedgehog-extras ^>= 0.8
+                      , hedgehog-extras ^>= 0.10
                       , http-conduit
                       , lens-aeson
                       , microlens

cardano-testnet/src/Parsers/Cardano.hs

@@ -5,10 +5,9 @@ module Parsers.Cardano
   , cmdCreateEnv
   ) where
 
-import           Cardano.Api (AnyShelleyBasedEra (..), EraInEon (..), prettyShow)
+import           Cardano.Api.Era (AnyShelleyBasedEra (..))
+import           Cardano.Api.Pretty
 
-import           Cardano.CLI.Environment
-import           Cardano.CLI.EraBased.Common.Option (bounded, command')
 import           Cardano.CLI.EraBased.Common.Option hiding (pNetworkId)
 
 import           Prelude
@@ -82,10 +81,6 @@ pCardanoTestnetCliOptions = CardanoTestnetOptions
       <>  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
       )
-  where
-    pAnyShelleyBasedEra' :: Parser AnyShelleyBasedEra
-    pAnyShelleyBasedEra' =
-      pAnyShelleyBasedEra envCli <&> (\(EraInEon x) -> AnyShelleyBasedEra x)
 
 pTestnetNodeOptions :: Parser [NodeOption]
 pTestnetNodeOptions =

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

@@ -62,7 +62,6 @@ import           Testnet.Property.Util (integrationWorkspace)
 import           Testnet.Start.Types (GenesisOptions (..), NumPools (..), cardanoNumPools)
 import           Testnet.TestQueryCmds (TestQueryCmds (..), forallQueryCommands)
 import           Testnet.Types
-import           RIO (runRIO)
 
 import           Hedgehog
 import qualified Hedgehog as H

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

@@ -82,7 +82,7 @@ hprop_rpc_transaction = integrationRetryWorkspace 2 "rpc-tx" $ \tempAbsBasePath'
       Rpc.nonStreaming conn (Rpc.rpc @(Rpc.Protobuf UtxoRpc.QueryService "readParams")) req
 
     utxos' <- do
-      let req = def & #addresses . #items .~ [T.encodeUtf8 addrTxt0]
+      let req = def & #cardanoAddresses . #items .~ [T.encodeUtf8 addrTxt0]
       Rpc.nonStreaming conn (Rpc.rpc @(Rpc.Protobuf UtxoRpc.QueryService "readUtxos")) req
     pure (pparams', utxos')
 
@@ -128,7 +128,7 @@ hprop_rpc_transaction = integrationRetryWorkspace 2 "rpc-tx" $ \tempAbsBasePath'
 
     utxos <-
       Rpc.nonStreaming conn (Rpc.rpc @(Rpc.Protobuf UtxoRpc.QueryService "readUtxos")) $
-        def & #addresses . #items .~ [T.encodeUtf8 addrTxt1]
+        def & #cardanoAddresses . #items .~ [T.encodeUtf8 addrTxt1]
     pure (utxos, submitResponse)
 
   submittedTxIds <- forM (submitResponse ^. #results) $ \res -> do