Update dependencies.

- cardano-ledger-specs has been reorganised for sanity. (IntersectMBO/cardano-ledger#2483) This entails a number of refactorings: - The package 'shelley-spec-ledger' is now deprecated in favour of 'cardano-ledger-shelley'. - Shelley.Spec.NonIntegral -> Cardano.Ledger.NonIntegral - Shelley.Spec.Ledger -> Cardano.Ledger.Shelley - *.STS -> *.Rules - Test.Shelley.Spec.Ledger -> Test.Cardano.Ledger.Shelley - As per IntersectMBO/ouroboros-network#3369, there is now no 'FilePath' argument to 'localSnocket'. - Bump base to include a potential memory leak fix.
IntersectMBO · Oct 4, 2021 · 3fa1692 · 3fa1692
1 parent 49269a5
commit 3fa1692
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 20 deletions.
diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -135,7 +135,7 @@ library
                       , parsec
                       , plutus-ledger-api
                       , prettyprinter
-                      , shelley-spec-ledger
+                      , cardano-ledger-shelley
                       , small-steps
                       , split
                       , strict-containers

diff --git a/cardano-cli/src/Cardano/CLI/Run/Friendly.hs b/cardano-cli/src/Cardano/CLI/Run/Friendly.hs
@@ -21,7 +21,7 @@ import           Cardano.Api
 import           Cardano.Api.Byron (Lovelace (..))
 import           Cardano.Api.Shelley (Address (ShelleyAddress), StakeAddress (..))
 import           Cardano.Ledger.Crypto (Crypto)
-import qualified Shelley.Spec.Ledger.API as Shelley
+import qualified Cardano.Ledger.Shelley.API as Shelley
 
 import           Cardano.CLI.Helpers (textShow)
 

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Commands.hs b/cardano-cli/src/Cardano/CLI/Shelley/Commands.hs
@@ -58,7 +58,7 @@ import           Cardano.CLI.Shelley.Key (PaymentVerifier, StakeVerifier, Verifi
                    VerificationKeyOrHashOrFile, VerificationKeyTextOrFile)
 import           Cardano.CLI.Types
 
-import           Shelley.Spec.Ledger.TxBody (MIRPot)
+import           Cardano.Ledger.Shelley.TxBody (MIRPot)
 --
 -- Shelley CLI command data types
 --

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Orphans.hs b/cardano-cli/src/Cardano/CLI/Shelley/Orphans.hs
@@ -35,12 +35,12 @@ import           Cardano.Protocol.TPraos (PoolDistr (..))
 import           Cardano.Protocol.TPraos.BHeader (HashHeader (..))
 
 import qualified Cardano.Ledger.Credential as Ledger
-import qualified Shelley.Spec.Ledger.API.Protocol as Ledger
-import qualified Shelley.Spec.Ledger.EpochBoundary as Ledger
-import qualified Shelley.Spec.Ledger.Rewards as Ledger
+import qualified Cardano.Ledger.Shelley.API.Protocol as Ledger
+import qualified Cardano.Ledger.Shelley.EpochBoundary as Ledger
+import qualified Cardano.Ledger.Shelley.Rewards as Ledger
 import qualified Cardano.Protocol.TPraos.Rules.Prtcl as Ledger
-import qualified Shelley.Spec.Ledger.STS.Tickn as Ledger
-import           Shelley.Spec.Ledger.TxBody (TxId (..))
+import qualified Cardano.Ledger.Shelley.Rules.Tickn as Ledger
+import           Cardano.Ledger.Shelley.TxBody (TxId (..))
 
 import qualified Cardano.Ledger.Mary.Value as Ledger.Mary
 

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Output.hs b/cardano-cli/src/Cardano/CLI/Shelley/Output.hs
@@ -18,7 +18,7 @@ import           Data.Aeson (KeyValue, ToJSON (..), (.=))
 import           Data.Function (id, ($), (.))
 import           Data.Maybe
 import           Data.Monoid (mconcat)
-import           Shelley.Spec.Ledger.Scripts ()
+import           Cardano.Ledger.Shelley.Scripts ()
 
 import qualified Data.Aeson as J
 import qualified Data.Aeson.Encoding as JE

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs b/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs
@@ -55,7 +55,7 @@ import qualified Text.Parsec.Language as Parsec
 import qualified Text.Parsec.String as Parsec
 import qualified Text.Parsec.Token as Parsec
 
-import qualified Shelley.Spec.Ledger.TxBody as Shelley
+import qualified Cardano.Ledger.Shelley.TxBody as Shelley
 
 {- HLINT ignore "Use <$>" -}
 

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Genesis.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Genesis.hs
@@ -65,8 +65,8 @@ import qualified Cardano.Ledger.Alonzo.Scripts as Alonzo
 import qualified Cardano.Ledger.BaseTypes as Ledger
 import           Cardano.Ledger.Coin (Coin (..))
 import qualified Cardano.Ledger.Keys as Ledger
-import qualified Shelley.Spec.Ledger.API as Ledger
-import qualified Shelley.Spec.Ledger.PParams as Shelley
+import qualified Cardano.Ledger.Shelley.API as Ledger
+import qualified Cardano.Ledger.Shelley.PParams as Shelley
 
 import           Cardano.Ledger.Crypto (ADDRHASH, Crypto, StandardCrypto)
 import           Cardano.Ledger.Era ()

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Governance.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Governance.hs
@@ -18,7 +18,7 @@ import           Cardano.CLI.Shelley.Key (InputDecodeError, VerificationKeyOrHas
 import           Cardano.CLI.Shelley.Parsers
 import           Cardano.CLI.Types
 
-import qualified Shelley.Spec.Ledger.TxBody as Shelley
+import qualified Cardano.Ledger.Shelley.TxBody as Shelley
 
 
 data ShelleyGovernanceCmdError

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs
@@ -52,9 +52,9 @@ import qualified Ouroboros.Consensus.HardFork.History as Consensus
 import           Ouroboros.Network.Block (Serialised (..))
 import           Ouroboros.Network.Protocol.LocalStateQuery.Type (AcquireFailure (..))
 import           Prelude (String, id)
-import           Shelley.Spec.Ledger.EpochBoundary
-import           Shelley.Spec.Ledger.LedgerState hiding (_delegations)
-import           Shelley.Spec.Ledger.Scripts ()
+import           Cardano.Ledger.Shelley.EpochBoundary
+import           Cardano.Ledger.Shelley.LedgerState hiding (_delegations)
+import           Cardano.Ledger.Shelley.Scripts ()
 import           Text.Printf (printf)
 
 import qualified Cardano.CLI.Shelley.Output as O
@@ -72,7 +72,7 @@ import qualified Data.Text.IO as Text
 import qualified Data.Vector as Vector
 import qualified Ouroboros.Consensus.HardFork.History.Qry as Qry
 import qualified Ouroboros.Network.Protocol.LocalStateQuery.Type as LocalStateQuery
-import qualified Shelley.Spec.Ledger.API.Protocol as Ledger
+import qualified Cardano.Ledger.Shelley.API.Protocol as Ledger
 import qualified System.IO as IO
 
 {- HLINT ignore "Reduce duplication" -}

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs
@@ -38,7 +38,7 @@ import qualified Cardano.Binary as CBOR
 
 --TODO: following import needed for orphan Eq Script instance
 import           Cardano.Ledger.ShelleyMA.TxBody ()
-import           Shelley.Spec.Ledger.Scripts ()
+import           Cardano.Ledger.Shelley.Scripts ()
 
 import           Cardano.CLI.Environment (EnvSocketError, readEnvSocketPath, renderEnvSocketError)
 import           Cardano.CLI.Run.Friendly (friendlyTxBodyBS)

diff --git a/cardano-cli/src/Cardano/CLI/Types.hs b/cardano-cli/src/Cardano/CLI/Types.hs
@@ -38,7 +38,7 @@ import           Cardano.Api
 
 import qualified Cardano.Ledger.Crypto as Crypto
 
-import           Shelley.Spec.Ledger.TxBody (PoolParams (..))
+import           Cardano.Ledger.Shelley.TxBody (PoolParams (..))
 
 -- | Specify what the CBOR file is
 -- i.e a block, a tx, etc
@@ -208,4 +208,3 @@ newtype TxOutChangeAddress = TxOutChangeAddress AddressAny
 -- | A flag that differentiates between automatically
 -- and manually balancing a tx.
 data BalanceTxExecUnits = AutoBalance | ManualBalance
-