cabal.project update cardano-ledger-specs dependency

This acquires the EraGen instance for AlonzoEra
IntersectMBO · May 11, 2021 · 6eae299 · 6eae299
1 parent 4143251
commit 6eae299
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 54 deletions.
diff --git a/cabal.project b/cabal.project
@@ -175,8 +175,8 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: c37546df004e81afc9ae25e7cb3ae028599f8fed
-  --sha256: 0wyspjbv6karc27qlxqpncv5xdpbb73hsscj0b0lii9dz9w9hb5f
+  tag: 433fdfa13035368613152dde85617d5cc50fb2d5
+  --sha256: 1ng2lsm47gy82ixzabczampmpy30c5y2sb52d47nd1f2x4v0l5az
   subdir:
     alonzo/impl
     alonzo/test

diff --git a/ouroboros-consensus-cardano-test/test/Test/Consensus/Cardano/Serialisation.hs b/ouroboros-consensus-cardano-test/test/Test/Consensus/Cardano/Serialisation.hs
@@ -33,7 +33,6 @@ import           Test.Util.Serialisation.Roundtrip
 
 import           Test.Consensus.Cardano.Generators (epochSlots)
 import           Test.Consensus.Cardano.MockCrypto (MockCryptoCompatByron)
-import           Test.Consensus.Shelley.Orphans ()
 
 tests :: TestTree
 tests = testGroup "Cardano"

diff --git a/ouroboros-consensus-shelley-test/ouroboros-consensus-shelley-test.cabal b/ouroboros-consensus-shelley-test/ouroboros-consensus-shelley-test.cabal
@@ -24,7 +24,6 @@ library
                        Test.Consensus.Shelley.Examples
                        Test.Consensus.Shelley.Generators
                        Test.Consensus.Shelley.MockCrypto
-                       Test.Consensus.Shelley.Orphans
                        Test.ThreadNet.Infra.Alonzo
                        Test.ThreadNet.Infra.Shelley
                        Test.ThreadNet.TxGen.Shelley

diff --git a/ouroboros-consensus-shelley-test/src/Test/Consensus/Shelley/Examples.hs b/ouroboros-consensus-shelley-test/src/Test/Consensus/Shelley/Examples.hs
@@ -106,8 +106,7 @@ import qualified Test.Shelley.Spec.Ledger.Utils as SL hiding (mkKeyPair,
                      mkKeyPair', mkVRFKeyPair)
 
 import qualified Cardano.Ledger.Mary.Value as MA
-import qualified Cardano.Ledger.Shelley.Constraints as SL (PParamsDelta,
-                     makeTxOut)
+import qualified Cardano.Ledger.Shelley.Constraints as SL (makeTxOut)
 import qualified Cardano.Ledger.ShelleyMA as MA
 import qualified Cardano.Ledger.ShelleyMA.AuxiliaryData as MA
 import qualified Cardano.Ledger.ShelleyMA.Timelocks as MA
@@ -214,7 +213,7 @@ examples ::
      ,   SL.PredicateFailure (Core.EraRule "DELEGS" era)
        ~ SL.DelegsPredicateFailure era
      , Core.PParams era ~ SL.PParams era
-     , SL.PParamsDelta era ~ SL.PParams' StrictMaybe era
+     , Core.PParamsDelta era ~ SL.PParams' StrictMaybe era
      )
   => (Core.TxBody era -> KeyPairWits era -> Core.Witnesses era)
   -> (Core.Tx era -> SL.TxInBlock era)
@@ -358,7 +357,7 @@ exampleTxBodyShelley = SL.TxBody
 exampleTxBodyMA ::
      forall era.
      ( ShelleyBasedEra era
-     , SL.PParamsDelta era ~ SL.PParams' StrictMaybe era
+     , Core.PParamsDelta era ~ SL.PParams' StrictMaybe era
      )
   => Core.Value era -> MA.TxBody era
 exampleTxBodyMA value = MA.TxBody
@@ -451,7 +450,7 @@ examplePoolDistr = SL.PoolDistr $ Map.fromList [
     ]
 
 exampleProposedPPUpdates ::
-  ( SL.PParamsDelta era ~ SL.PParams' StrictMaybe era
+  ( Core.PParamsDelta era ~ SL.PParams' StrictMaybe era
   , ShelleyBasedEra era
   ) => SL.ProposedPPUpdates era
 exampleProposedPPUpdates = SL.ProposedPPUpdates $

diff --git a/ouroboros-consensus-shelley-test/src/Test/Consensus/Shelley/Generators.hs b/ouroboros-consensus-shelley-test/src/Test/Consensus/Shelley/Generators.hs
@@ -34,8 +34,9 @@ import           Test.Util.Orphans.Arbitrary ()
 import           Test.Util.Serialisation.Roundtrip (SomeResult (..),
                      WithVersion (..))
 
-import           Test.Cardano.Ledger.Allegra ()
-import           Test.Cardano.Ledger.Mary ()
+import           Test.Cardano.Ledger.AllegraEraGen ()
+import           Test.Cardano.Ledger.Alonzo.AlonzoEraGen ()
+import           Test.Cardano.Ledger.MaryEraGen ()
 import           Test.Cardano.Ledger.ShelleyMA.Serialisation.Generators ()
 import           Test.Consensus.Shelley.MockCrypto (CanMock, CanMockOld)
 import           Test.Shelley.Spec.Ledger.ConcreteCryptoTypes as SL

diff --git a/ouroboros-consensus-shelley-test/src/Test/Consensus/Shelley/Orphans.hs b/ouroboros-consensus-shelley-test/src/Test/Consensus/Shelley/Orphans.hs
diff --git a/ouroboros-consensus-shelley-test/src/Test/ThreadNet/Infra/Shelley.hs b/ouroboros-consensus-shelley-test/src/Test/ThreadNet/Infra/Shelley.hs
@@ -76,7 +76,6 @@ import           Cardano.Ledger.Hashes (EraIndependentTxBody)
 import           Cardano.Ledger.SafeHash (HashAnnotated (..), SafeHash,
                      hashAnnotated)
 import qualified Cardano.Ledger.Val as SL
-import qualified Cardano.Ledger.Shelley.Constraints as SL
 import qualified Cardano.Ledger.ShelleyMA.TxBody as MA
 import qualified Shelley.Spec.Ledger.API as SL
 import qualified Shelley.Spec.Ledger.BaseTypes as SL (truncateUnitInterval,
@@ -552,7 +551,7 @@ mkAllegraSetDecentralizationParamTxs ::
      ( ShelleyBasedEra era
      , Cardano.Ledger.Core.TxBody era ~ MA.TxBody era
      , Cardano.Ledger.Core.PParams era ~ SL.PParams era
-     , SL.PParamsDelta era ~ SL.PParams' SL.StrictMaybe era
+     , Cardano.Ledger.Core.PParamsDelta era ~ SL.PParams' SL.StrictMaybe era
      , Cardano.Ledger.Core.Witnesses era ~ SL.WitnessSet era
      )
   => [CoreNode (Cardano.Ledger.Era.Crypto era)]

diff --git a/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Eras.hs b/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Eras.hs
@@ -132,8 +132,8 @@ class ( SL.ShelleyBasedEra era
       , FromCBOR (LC.PParams era)
       , ToCBOR (LC.PParams era)
 
-      , HasField "_protocolVersion" (SL.PParamsDelta era) (SL.StrictMaybe SL.ProtVer)
-      , FromCBOR (SL.PParamsDelta era)
+      , HasField "_protocolVersion" (LC.PParamsDelta era) (SL.StrictMaybe SL.ProtVer)
+      , FromCBOR (LC.PParamsDelta era)
 
       , SL.AdditionalGenesisConfig era ~ ()
 

diff --git a/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Ledger/Inspect.hs b/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Ledger/Inspect.hs
@@ -32,7 +32,7 @@ import           Ouroboros.Consensus.Ledger.Inspect
 import           Ouroboros.Consensus.Util
 import           Ouroboros.Consensus.Util.Condense
 
-import qualified Cardano.Ledger.Shelley.Constraints as SL
+import qualified Cardano.Ledger.Core as LC
 import qualified Shelley.Spec.Ledger.API as SL
 import           Shelley.Spec.Ledger.BaseTypes (strictMaybeToMaybe)
 
@@ -44,8 +44,8 @@ data ProtocolUpdate era = ProtocolUpdate {
       protocolUpdateProposal :: UpdateProposal era
     , protocolUpdateState    :: UpdateState (EraCrypto era)
     }
-deriving instance Eq (SL.PParamsDelta era) => Eq (ProtocolUpdate era)
-deriving instance Show (SL.PParamsDelta era) => Show (ProtocolUpdate era)
+deriving instance Eq (LC.PParamsDelta era) => Eq (ProtocolUpdate era)
+deriving instance Show (LC.PParamsDelta era) => Show (ProtocolUpdate era)
 
 -- | Update proposal
 --
@@ -54,7 +54,7 @@ data UpdateProposal era = UpdateProposal {
       -- | The protocol parameters changed by this update proposal
       --
       -- An update is /identified/ by how it updates the protocol parameters.
-      proposalParams  :: SL.PParamsDelta era
+      proposalParams  :: LC.PParamsDelta era
 
       -- | New version (if changed by this proposal)
       --
@@ -71,8 +71,8 @@ data UpdateProposal era = UpdateProposal {
     , proposalEpoch   :: EpochNo
     }
 
-deriving instance Eq (SL.PParamsDelta era) => Eq (UpdateProposal era)
-deriving instance Show (SL.PParamsDelta era) => Show (UpdateProposal era)
+deriving instance Eq (LC.PParamsDelta era) => Eq (UpdateProposal era)
+deriving instance Show (LC.PParamsDelta era) => Show (UpdateProposal era)
 
 -- | Proposal state
 --
@@ -124,14 +124,14 @@ protocolUpdates genesis st = [
     | (proposal, votes) <- proposalsInv
     ]
   where
-    proposalsInv :: [(SL.PParamsDelta era, [SL.KeyHash 'SL.Genesis (EraCrypto era)])]
+    proposalsInv :: [(LC.PParamsDelta era, [SL.KeyHash 'SL.Genesis (EraCrypto era)])]
     proposalsInv =
           groupSplit id
         . sortBy (comparing fst)
         $ map swap (Map.toList proposals)
 
     -- Updated proposed within the proposal window
-    proposals :: Map (SL.KeyHash 'SL.Genesis (EraCrypto era)) (SL.PParamsDelta era)
+    proposals :: Map (SL.KeyHash 'SL.Genesis (EraCrypto era)) (LC.PParamsDelta era)
     SL.ProposedPPUpdates proposals =
           SL.proposals
         . SL._ppups
@@ -159,10 +159,10 @@ protocolUpdates genesis st = [
 data ShelleyLedgerUpdate era =
     ShelleyUpdatedProtocolUpdates [ProtocolUpdate era]
 
-deriving instance Eq (SL.PParamsDelta era) => Eq (ShelleyLedgerUpdate era)
-deriving instance Show (SL.PParamsDelta era) => Show (ShelleyLedgerUpdate era)
+deriving instance Eq (LC.PParamsDelta era) => Eq (ShelleyLedgerUpdate era)
+deriving instance Show (LC.PParamsDelta era) => Show (ShelleyLedgerUpdate era)
 
-instance Show (SL.PParamsDelta era) => Condense (ShelleyLedgerUpdate era) where
+instance Show (LC.PParamsDelta era) => Condense (ShelleyLedgerUpdate era) where
   condense = show
 
 instance ShelleyBasedEra era => InspectLedger (ShelleyBlock era) where