From 78f56c59411ecebe7d081411f3395f485606586c Mon Sep 17 00:00:00 2001 From: Pablo Lamela Date: Wed, 30 Oct 2024 15:42:58 +0100 Subject: [PATCH] Remove transitive dependencies to `ouroboros-consensus-cardano` --- cardano-cli/cardano-cli.cabal | 1 - cardano-cli/src/Cardano/CLI/Byron/Tx.hs | 5 ++--- cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs | 2 +- .../Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs | 2 +- .../src/Cardano/CLI/Types/Errors/GovernanceQueryError.hs | 3 +-- cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdError.hs | 2 +- .../Cardano/CLI/Types/Errors/QueryCmdLocalStateQueryError.hs | 2 +- cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs | 2 +- 8 files changed, 8 insertions(+), 11 deletions(-) diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal index 8c02e82b4f..efb2a57019 100644 --- a/cardano-cli/cardano-cli.cabal +++ b/cardano-cli/cardano-cli.cabal @@ -234,7 +234,6 @@ library network-uri, optparse-applicative-fork, ouroboros-consensus ^>=0.21, - ouroboros-consensus-cardano ^>=0.20, parsec, prettyprinter, prettyprinter-ansi-terminal, diff --git a/cardano-cli/src/Cardano/CLI/Byron/Tx.hs b/cardano-cli/src/Cardano/CLI/Byron/Tx.hs index b616d38443..eeba6ff75e 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/Tx.hs +++ b/cardano-cli/src/Cardano/CLI/Byron/Tx.hs @@ -25,6 +25,8 @@ where import Cardano.Api import qualified Cardano.Api.Byron as Byron +import Cardano.Api.Consensus (ByronBlock, EraMismatch (..), GenTx (..)) +import qualified Cardano.Api.Consensus as Byron import qualified Cardano.Api.Ledger as L import qualified Cardano.Api.Network as Net.Tx @@ -32,9 +34,6 @@ import qualified Cardano.Binary as Binary import Cardano.CLI.Byron.Key (byronWitnessToVerKey) import Cardano.CLI.Types.Common (TxFile) import qualified Cardano.Crypto.Signing as Crypto -import Ouroboros.Consensus.Byron.Ledger (ByronBlock, GenTx (..)) -import qualified Ouroboros.Consensus.Byron.Ledger as Byron -import Ouroboros.Consensus.Cardano.Block (EraMismatch (..)) import Data.Bifunctor (Bifunctor (..)) import Data.ByteString (ByteString) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs index 87cdab28f0..71e75ec8dd 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs @@ -31,6 +31,7 @@ import Cardano.Api import Cardano.Api.Byron (toByronLovelace, toByronProtocolMagicId, toByronRequiresNetworkMagic) import qualified Cardano.Api.Byron as Byron hiding (GenesisParameters, SigningKey) +import Cardano.Api.Consensus (ShelleyGenesisStaking (..)) import qualified Cardano.Api.Ledger as L import Cardano.Api.Shelley @@ -55,7 +56,6 @@ import qualified Cardano.Crypto.Hash as Crypto import qualified Cardano.Crypto.Signing as Byron import Cardano.Prelude (canonicalEncodePretty) import Cardano.Slotting.Slot (EpochSize (EpochSize)) -import Ouroboros.Consensus.Shelley.Node (ShelleyGenesisStaking (..)) import Control.DeepSeq (NFData, force) import Control.Exception (evaluate) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs index d225efee18..f294acc58c 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs @@ -22,6 +22,7 @@ module Cardano.CLI.EraBased.Run.Genesis.CreateTestnetData where import Cardano.Api hiding (ConwayEra) +import Cardano.Api.Consensus (ShelleyGenesisStaking (..)) import Cardano.Api.Ledger (StrictMaybe (SNothing)) import qualified Cardano.Api.Ledger as L import Cardano.Api.Shelley (Hash (..), KESPeriod (KESPeriod), @@ -49,7 +50,6 @@ import Cardano.CLI.Types.Errors.GenesisCmdError import Cardano.CLI.Types.Errors.NodeCmdError import Cardano.CLI.Types.Errors.StakePoolCmdError import Cardano.CLI.Types.Key -import Ouroboros.Consensus.Shelley.Node (ShelleyGenesisStaking (..)) import Control.DeepSeq (NFData, deepseq) import Control.Monad (forM, forM_, unless, void, when) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceQueryError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceQueryError.hs index b762a95dcd..f455fa0aa5 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceQueryError.hs +++ b/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceQueryError.hs @@ -3,10 +3,9 @@ module Cardano.CLI.Types.Errors.GovernanceQueryError where import Cardano.Api +import Cardano.Api.Consensus (EraMismatch) import Cardano.Api.Shelley -import Ouroboros.Consensus.Cardano.Block (EraMismatch) - data GovernanceQueryError = GovernanceQueryWriteFileError !(FileError ()) | GovernanceQueryAcqireFailureError !AcquiringFailure diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdError.hs index f2879d56dd..ca023fe928 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdError.hs +++ b/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdError.hs @@ -15,13 +15,13 @@ module Cardano.CLI.Types.Errors.QueryCmdError where import Cardano.Api hiding (QueryInShelleyBasedEra (..)) +import Cardano.Api.Consensus as Consensus (EraMismatch (..)) import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..)) import Cardano.Binary (DecoderError) import Cardano.CLI.Helpers (HelpersError (..), renderHelpersError) import Cardano.CLI.Types.Errors.GenesisCmdError import Cardano.CLI.Types.Errors.QueryCmdLocalStateQueryError -import Ouroboros.Consensus.Cardano.Block as Consensus (EraMismatch (..)) import qualified Ouroboros.Consensus.HardFork.History.Qry as Qry import qualified Data.ByteString.Lazy.Char8 as LBS diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdLocalStateQueryError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdLocalStateQueryError.hs index 6b9a5f8042..f9f7005773 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdLocalStateQueryError.hs +++ b/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdLocalStateQueryError.hs @@ -8,9 +8,9 @@ module Cardano.CLI.Types.Errors.QueryCmdLocalStateQueryError where import Cardano.Api +import Cardano.Api.Consensus (EraMismatch (..)) import Cardano.CLI.Types.Errors.NodeEraMismatchError -import Ouroboros.Consensus.Cardano.Block (EraMismatch (..)) -- | An error that can occur while querying a node's local state. newtype QueryCmdLocalStateQueryError diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs index 352f2a38da..510ebf6193 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs +++ b/cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs @@ -15,6 +15,7 @@ module Cardano.CLI.Types.Errors.TxCmdError where import Cardano.Api +import Cardano.Api.Consensus (EraMismatch (..)) import qualified Cardano.Api.Ledger as L import Cardano.Api.Shelley @@ -29,7 +30,6 @@ import Cardano.CLI.Types.Errors.TxValidationError import Cardano.CLI.Types.Output import Cardano.CLI.Types.TxFeature import qualified Cardano.Prelude as List -import Ouroboros.Consensus.Cardano.Block (EraMismatch (..)) import Data.Text (Text)