Formatting and cleanup

Author: jasagredo

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Eras.hs

@@ -53,16 +53,12 @@ import qualified Cardano.Ledger.Babbage.Translation as Babbage
 import           Cardano.Ledger.BaseTypes
 import           Cardano.Ledger.Binary (DecCBOR, EncCBOR)
 import           Cardano.Ledger.Conway (ConwayEra)
-import           Cardano.Ledger.Conway.Genesis
 import qualified Cardano.Ledger.Conway.Governance as CG
 import qualified Cardano.Ledger.Conway.Rules as Conway
 import qualified Cardano.Ledger.Conway.Rules as SL
                      (ConwayLedgerPredFailure (..))
 import qualified Cardano.Ledger.Conway.Translation as Conway
 import           Cardano.Ledger.Core as Core
-import           Cardano.Ledger.Crypto (StandardCrypto)
-import           Cardano.Ledger.Genesis
-import           Cardano.Ledger.Keys (DSignable, Hash)
 import           Cardano.Ledger.Mary (MaryEra)
 import           Cardano.Ledger.Mary.Translation ()
 import           Cardano.Ledger.Shelley (ShelleyEra)
@@ -71,17 +67,15 @@ import           Cardano.Ledger.Shelley.Core as Core
 import qualified Cardano.Ledger.Shelley.LedgerState as SL
 import qualified Cardano.Ledger.Shelley.Rules as SL
 import qualified Cardano.Ledger.Shelley.Transition as SL
-import           Cardano.Ledger.Shelley.Translation
-import           Cardano.Protocol.Crypto (StandardCrypto)
 import qualified Cardano.Protocol.TPraos.API as SL
 import           Control.Monad.Except
 import           Control.State.Transition (PredicateFailure)
 import           Data.Data (Proxy (Proxy))
 import           Data.List.NonEmpty (NonEmpty ((:|)))
-import           Data.Typeable (Typeable)
 import           NoThunks.Class (NoThunks)
 import           Ouroboros.Consensus.Ledger.SupportsMempool
                      (WhetherToIntervene (..))
+import           Ouroboros.Consensus.Protocol.TPraos (StandardCrypto)
 
 {-------------------------------------------------------------------------------
   Eras instantiated with standard crypto

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Node/Serialisation.hs

@@ -16,7 +16,6 @@ import           Cardano.Ledger.BaseTypes
 import           Cardano.Ledger.Core (fromEraCBOR, toEraCBOR)
 import qualified Cardano.Ledger.Core as SL
 import qualified Cardano.Ledger.Shelley.API as SL
-import qualified Cardano.Protocol.TPraos.API as SL
 import           Cardano.Slotting.EpochInfo (epochInfoSize,
                      epochInfoSlotToRelativeTime, fixedEpochInfo,
                      hoistEpochInfo)
@@ -169,27 +168,6 @@ instance ShelleyCompatible proto era
   encodeNodeToClient _ _ = wrapCBORinCBOR   encodeShelleyBlock
   decodeNodeToClient _ _ = unwrapCBORinCBOR decodeShelleyBlock
 
---------------------------------------------------------------------------------
---  ↓↓↓ REMOVE ↓↓↓
---
--- This code fills the holes from
--- https://github.com/IntersectMBO/cardano-ledger/issues/4893 and must
--- be removed before merging!!
---------------------------------------------------------------------------------
-
-instance FromCBOR ActiveSlotCoeff where
-  fromCBOR = undefined
-instance FromCBOR Network where
-  fromCBOR = undefined
-instance ToCBOR ActiveSlotCoeff where
-  toCBOR = undefined
-instance ToCBOR Network where
-  toCBOR = undefined
-
---------------------------------------------------------------------------------
--- ↑↑↑ REMOVE ↑↑↑
---------------------------------------------------------------------------------
-
 -- | This instance uses the invariant that the 'EpochInfo' in a
 -- 'ShelleyLedgerConfig' is fixed i.e. has a constant 'EpochSize' and
 -- 'SlotLength'. This is not true in the case of the HFC in a
@@ -239,13 +217,13 @@ instance ShelleyBasedEra era
     enforceSize "ShelleyPartialLedgerConfig era" 14
     ShelleyPartialLedgerConfig
       <$> ( ShelleyLedgerConfig
-        <$> fromCBOR @(CompactGenesis (EraCrypto era))
+        <$> fromCBOR @CompactGenesis
         <*> (SL.Globals
               (hoistEpochInfo (Right . runIdentity) $ toPureEpochInfo dummyEpochInfo)
               <$> fromCBOR @Word64
               <*> fromCBOR @Word64
               <*> fromCBOR @Word64
-              <*> fromCBOR @Word64
+              <*> fromCBOR @(NonZero Word64)
               <*> fromCBOR @Word64
               <*> fromCBOR @Word64
               <*> fromCBOR @Word64
@@ -279,11 +257,11 @@ instance ShelleyBasedEra era
       triggerHardFork
     )
       = encodeListLen 14
-        <> toCBOR @(CompactGenesis (EraCrypto era)) myCompactGenesis
+        <> toCBOR @CompactGenesis myCompactGenesis
         <> toCBOR @Word64 slotsPerKESPeriod'
         <> toCBOR @Word64 stabilityWindow'
         <> toCBOR @Word64 randomnessStabilisationWindow'
-        <> toCBOR @Word64 securityParameter'
+        <> toCBOR @(NonZero Word64) securityParameter'
         <> toCBOR @Word64 maxKESEvo'
         <> toCBOR @Word64 quorum'
         <> toCBOR @Word64 maxLovelaceSupply'

ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Examples.hs

@@ -107,7 +107,7 @@ combineEras perEraExamples = Examples {
         $ himap (\ix -> K . inj ix . getExamples) perEraExamplesPrefixed
       where
         inj :: forall blk. Index (CardanoEras Crypto) blk -> Labelled (f blk) -> Labelled (f (CardanoBlock Crypto))
-        inj idx = fmap (fmap (inject exampleStartBounds idx))
+        inj idx = fmap (fmap (inject $ oracularInjectionIndex exampleStartBounds idx))
 
     perEraExamplesPrefixed :: NP Examples (CardanoEras Crypto)
     perEraExamplesPrefixed = hzipWith (\(K eraName) es -> prefixExamples eraName es) perEraNames perEraExamples

ouroboros-consensus-cardano/src/unstable-shelley-testlib/Test/Consensus/Shelley/Examples.hs

@@ -22,7 +22,6 @@ module Test.Consensus.Shelley.Examples (
 
 import qualified Cardano.Ledger.Block as SL
 import           Cardano.Ledger.Core
-import           Cardano.Ledger.Crypto (Crypto)
 import qualified Cardano.Ledger.Shelley.API as SL
 import           Cardano.Protocol.Crypto (StandardCrypto)
 import qualified Cardano.Protocol.TPraos.BHeader as SL
@@ -267,11 +266,11 @@ examplesBabbage = fromShelleyLedgerExamplesPraos ledgerExamplesBabbage
 examplesConway :: Examples StandardConwayBlock
 examplesConway = fromShelleyLedgerExamplesPraos ledgerExamplesConway
 
-exampleShelleyLedgerConfig :: forall era. ShelleyBasedEra era => TranslationContext era -> ShelleyLedgerConfig era
+exampleShelleyLedgerConfig :: TranslationContext era -> ShelleyLedgerConfig era
 exampleShelleyLedgerConfig translationContext = ShelleyLedgerConfig {
       shelleyLedgerCompactGenesis = compactGenesis testShelleyGenesis
     , shelleyLedgerGlobals = SL.mkShelleyGlobals
-        (testShelleyGenesis @(EraCrypto era))
+        testShelleyGenesis
         epochInfo
     , shelleyLedgerTranslationContext = translationContext
     }

ouroboros-consensus-cardano/src/unstable-shelley-testlib/Test/Consensus/Shelley/Generators.hs

@@ -11,7 +11,6 @@
 module Test.Consensus.Shelley.Generators (SomeResult (..)) where
 
 import           Cardano.Ledger.Core (TranslationContext, toTxSeq)
-import           Cardano.Ledger.Crypto (Crypto)
 import           Cardano.Ledger.Genesis
 import qualified Cardano.Ledger.Shelley.API as SL
 import           Cardano.Ledger.Shelley.Translation
@@ -223,16 +222,14 @@ instance ShelleyBasedEra era
 
 -- | Generate a 'ShelleyLedgerConfig' with a fixed 'EpochInfo' (see
 -- 'arbitraryGlobalsWithFixedEpochInfo').
-instance ( Crypto (EraCrypto era)
-         , Arbitrary (TranslationContext era)
+instance ( Arbitrary (TranslationContext era)
          ) => Arbitrary (ShelleyLedgerConfig era) where
   arbitrary = ShelleyLedgerConfig
     <$> arbitrary
     <*> arbitraryGlobalsWithFixedEpochInfo
     <*> arbitrary
 
-instance ( Crypto c
-         ) => Arbitrary (CompactGenesis c) where
+instance Arbitrary CompactGenesis where
   arbitrary = compactGenesis <$> arbitrary
 
 -- | Generate 'Globals' with a fixed 'EpochInfo'. A fixed 'EpochInfo' is
@@ -258,7 +255,7 @@ arbitraryFixedEpochInfo = fixedEpochInfo <$> arbitrary <*> arbitrary
 instance Arbitrary (NoGenesis era) where
   arbitrary = pure NoGenesis
 
-instance Crypto c => Arbitrary (FromByronTranslationContext c) where
+instance Arbitrary FromByronTranslationContext where
   arbitrary = FromByronTranslationContext <$> arbitrary <*> arbitrary <*> arbitrary
 
 {-------------------------------------------------------------------------------

ouroboros-consensus-cardano/test/shelley-test/Test/ThreadNet/Shelley.hs

@@ -31,7 +31,7 @@ import qualified Ouroboros.Consensus.Shelley.Ledger as Shelley
 import           Ouroboros.Consensus.Shelley.Ledger.SupportsProtocol ()
 import           Ouroboros.Consensus.Shelley.Node
 import           Ouroboros.Consensus.Shelley.ShelleyHFC ()
-import           Test.Consensus.Shelley.MockCrypto (MockCrypto, MockShelley)
+import           Test.Consensus.Shelley.MockCrypto (MockCrypto)
 import           Test.QuickCheck
 import           Test.Tasty
 import           Test.Tasty.QuickCheck

ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/HardFork/Combinator/A.hs

@@ -38,7 +38,7 @@ module Test.Consensus.HardFork.Combinator.A (
   , TxId (..)
   ) where
 
-import           Cardano.Ledger.BaseTypes (unNonZero)
+import           Cardano.Ledger.BaseTypes.NonZero
 import           Cardano.Slotting.EpochInfo
 import           Codec.Serialise
 import           Control.Monad (guard)
@@ -201,6 +201,13 @@ data PartialLedgerConfigA = LCfgA {
   deriving Serialise
 
 deriving newtype instance Serialise SecurityParam
+instance (HasZero a, Serialise a) => Serialise (NonZero a) where
+  encode = encode . unNonZero
+  decode = do
+    a <- decode
+    case nonZero a of
+      Nothing -> fail "Expected non zero but found zero!"
+      Just a' -> pure a'
 
 type instance LedgerCfg (LedgerState BlockA) =
     (EpochInfo Identity, PartialLedgerConfigA)

ouroboros-consensus/ouroboros-consensus.cabal

@@ -391,8 +391,8 @@ library unstable-consensus-testlib
     bytestring,
     cardano-binary:testlib,
     cardano-crypto-class,
-    cardano-ledger-core,
     cardano-ledger-binary:testlib,
+    cardano-ledger-core,
     cardano-prelude,
     cardano-slotting:testlib,
     cardano-strict-containers,

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Config/SecurityParam.hs

@@ -2,10 +2,12 @@
 {-# LANGUAGE DerivingVia #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 
+{-# OPTIONS_GHC -Wno-orphans #-}
+
 module Ouroboros.Consensus.Config.SecurityParam (SecurityParam (..)) where
 
 import           Cardano.Binary
-import           Cardano.Ledger.BaseTypes (NonZero)
+import           Cardano.Ledger.BaseTypes.NonZero
 import           Data.Word
 import           GHC.Generics (Generic)
 import           NoThunks.Class (NoThunks)
@@ -23,3 +25,13 @@ import           Quiet
 newtype SecurityParam = SecurityParam { maxRollbacks :: NonZero Word64 }
   deriving (Eq, Generic, NoThunks, ToCBOR, FromCBOR)
   deriving Show via Quiet SecurityParam
+
+instance ToCBOR a => ToCBOR (NonZero a) where
+  toCBOR = toCBOR . unNonZero
+
+instance (HasZero a, FromCBOR a) => FromCBOR (NonZero a) where
+  fromCBOR = do
+    a <- fromCBOR
+    case nonZero a of
+      Nothing -> fail "Non zero expected but zero found!"
+      Just a' -> pure a'

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Nary.hs

@@ -165,7 +165,7 @@ instance Inject I where
   inject = injectNS' (Proxy @I) . forgetInjectionIndex
 
 instance Inject (K a) where
-  inject _ _ (K a) = K a
+  inject _ (K a) = K a
 
 instance Inject Header where
   inject = injectNS' (Proxy @Header) . forgetInjectionIndex

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/Query/Version.hs

@@ -27,4 +27,4 @@ nodeToClientVersionToQueryVersion x = case x of
   NodeToClientV_17 -> QueryVersion2
   NodeToClientV_18 -> QueryVersion2
   NodeToClientV_19 -> QueryVersion2
-  NodeToClienvV_20 -> QueryVersion3
+  NodeToClientV_20 -> QueryVersion3