Cleanup

Author: jasagredo

cabal.project

@@ -34,10 +34,9 @@ multi-repl: True
 
 import: ./asserts.cabal
 
-allow-newer: plutus-core:cardano-crypto-class
-           , bytestring
-           , serdoc-core:tasty-quickcheck
-           , kes-agent:base
+allow-newer:
+    serdoc-core:tasty-quickcheck
+  , kes-agent:base
 
 package ouroboros-network
   -- Certain ThreadNet tests rely on transactions to be submitted promptly after
@@ -63,6 +62,11 @@ if impl (ghc >= 9.12)
     -- https://github.com/kapralVV/Unique/issues/11
     , Unique:hashable
 
+    , serdoc-core:template-haskell
+    , serdoc-core:th-abstraction
+    , kes-agent:containers
+    , kes-agent:extra
+
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/kes-agent

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

@@ -1,6 +1,5 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 
 {-# OPTIONS_GHC -Wno-orphans #-}

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

@@ -2,7 +2,6 @@
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE TypeOperators #-}
 
 {-# OPTIONS_GHC -Wno-orphans #-}
 -- See https://gitlab.haskell.org/ghc/ghc/-/issues/14630. GHC currently warns

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

@@ -2,7 +2,6 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE TypeOperators #-}
 
 {-# OPTIONS_GHC -Wno-orphans #-}
 

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

@@ -144,7 +144,7 @@ hardForkInto Conway =
 --
 mkSimpleTestProtocolInfo ::
      forall c
-   . (CardanoHardForkConstraints c)
+   . (CardanoHardForkConstraints c, KESAgentContext c IO)
   => Shelley.DecentralizationParam
   -- ^ Network decentralization parameter.
   -> SecurityParam
@@ -217,7 +217,6 @@ mkTestProtocolInfo ::
      forall m c
    . ( CardanoHardForkConstraints c
      , KESAgentContext c m
-     , c ~ StandardCrypto
      )
   => (CoreNodeId, Shelley.CoreNode c)
   -- ^ Id of the node for which the protocol info will be elaborated.

ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs

@@ -91,7 +91,6 @@ import           Ouroboros.Consensus.Storage.LedgerDB
 import           Ouroboros.Consensus.TypeFamilyWrappers
 import           Ouroboros.Consensus.Util (eitherToMaybe)
 import           Ouroboros.Consensus.Util.IndexedMemPack
-import           Ouroboros.Consensus.Util.IOLike (IOLike)
 import           Test.ThreadNet.TxGen
 import           Test.ThreadNet.TxGen.Shelley ()
 

ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Api/KeysPraos.hs

@@ -48,7 +48,7 @@ instance HasTypeProxy UnsoundPureKesKey where
 instance Key UnsoundPureKesKey where
 
     newtype VerificationKey UnsoundPureKesKey =
-        KesVerificationKey (Shelley.VerKeyKES StandardCrypto)
+        KesVerificationKey (Crypto.VerKeyKES (KES StandardCrypto))
       deriving stock (Eq)
       deriving (Show, IsString) via UsingRawBytesHex (VerificationKey UnsoundPureKesKey)
       deriving newtype (EncCBOR, DecCBOR, ToCBOR, FromCBOR)
@@ -104,10 +104,9 @@ instance SerialiseAsBech32 (SigningKey UnsoundPureKesKey) where
     bech32PrefixFor         _ =  "kes_sk"
     bech32PrefixesPermitted _ = ["kes_sk"]
 
-
 newtype instance Hash UnsoundPureKesKey =
-    UnsoundPureKesKeyHash (Shelley.Hash StandardCrypto
-                             (Shelley.VerKeyKES StandardCrypto))
+    UnsoundPureKesKeyHash (Crypto.Hash HASH
+                             (Crypto.VerKeyKES (KES StandardCrypto)))
   deriving stock (Eq, Ord)
   deriving (Show, IsString) via UsingRawBytesHex (Hash UnsoundPureKesKey)
   deriving (ToCBOR, FromCBOR) via UsingRawBytes (Hash UnsoundPureKesKey)

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

@@ -19,9 +19,7 @@ import           Cardano.Crypto.KES (MockKES)
 import qualified Cardano.Crypto.KES as KES (Signable)
 import           Cardano.Crypto.Util (SignableRepresentation)
 import           Cardano.Crypto.VRF (MockVRF)
-import qualified Cardano.KESAgent.KES.Crypto as Agent
-import qualified Cardano.KESAgent.Processes.ServiceClient as Agent
-import qualified Cardano.KESAgent.Protocols.VersionedProtocol as Agent
+import           Cardano.KESAgent.Protocols.StandardCrypto (MockCrypto)
 import           Cardano.Ledger.BaseTypes (Seed)
 import qualified Cardano.Ledger.Shelley.API as SL
 import qualified Cardano.Ledger.Shelley.Core as Core
@@ -42,16 +40,8 @@ import           Ouroboros.Consensus.Shelley.Ledger (ShelleyBlock,
 import           Ouroboros.Consensus.Shelley.Protocol.Abstract (ProtoCrypto)
 import           Test.QuickCheck (Arbitrary)
 
--- | A mock replacement for 'StandardCrypto'
---
--- We run the tests with this mock crypto, as it is easier to generate and
--- debug things. The code is parametric in the crypto, so it shouldn't make
--- much of a difference. This also has the important advantage
--- that we can reuse the generators from cardano-ledger-specs.
-data MockCrypto
-
 instance Crypto MockCrypto where
-  type KES      MockCrypto = MockKES 10
+  type KES      MockCrypto = MockKES 128
   type VRF      MockCrypto = MockVRF
 
 instance SL.PraosCrypto MockCrypto
@@ -86,15 +76,5 @@ type CanMock proto era =
   , Arbitrary (SL.CertState era)
   )
 
-instance Agent.NamedCrypto (MockCrypto h) where
-  cryptoName _ = Agent.CryptoName "Mock"
-
-instance Agent.ServiceClientDrivers (MockCrypto h) where
-  availableServiceClientDrivers = []
-
-instance Agent.Crypto (MockCrypto h) where
-  type KES (MockCrypto h) = MockKES 10
-  type DSIGN (MockCrypto h) = MockDSIGN
-
-instance HashAlgorithm h => AgentCrypto (MockCrypto h) where
-  type ACrypto (MockCrypto h) = MockCrypto h
+instance AgentCrypto MockCrypto where
+  type ACrypto MockCrypto = MockCrypto

ouroboros-consensus-cardano/src/unstable-shelley-testlib/Test/ThreadNet/Infra/Shelley.hs

@@ -38,7 +38,6 @@ module Test.ThreadNet.Infra.Shelley (
 
 import           Cardano.Crypto.DSIGN (DSIGNAlgorithm (..), SignKeyDSIGN,
                      seedSizeDSIGN)
-import           Cardano.Crypto.Hash (HashAlgorithm)
 import           Cardano.Crypto.KES (KESAlgorithm (..),
                      UnsoundPureKESAlgorithm (..), UnsoundPureSignKeyKES,
                      seedSizeKES, unsoundPureDeriveVerKeyKES,
@@ -144,7 +143,7 @@ data CoreNode c = CoreNode {
     , cnStakingKey  :: !(SignKeyDSIGN LK.DSIGN)
       -- ^ The hash of the corresponding verification (public) key will be
       -- used as the staking credential.
-    , cnVRF         :: !(SL.SignKeyVRF   c)
+    , cnVRF         :: !(SignKeyVRF   (VRF c))
     , cnKES         :: !(UnsoundPureSignKeyKES (KES c))
     , cnOCert       :: !(SL.OCert        c)
     }
@@ -184,9 +183,9 @@ genCoreNode ::
   => SL.KESPeriod
   -> Gen (CoreNode c)
 genCoreNode startKESPeriod = do
-    genKey <- genKeyDSIGN <$> genSeed (seedSizeDSIGN (Proxy @(DSIGN c)))
-    delKey <- genKeyDSIGN <$> genSeed (seedSizeDSIGN (Proxy @(DSIGN c)))
-    stkKey <- genKeyDSIGN <$> genSeed (seedSizeDSIGN (Proxy @(DSIGN c)))
+    genKey <- genKeyDSIGN <$> genSeed (seedSizeDSIGN (Proxy @LK.DSIGN))
+    delKey <- genKeyDSIGN <$> genSeed (seedSizeDSIGN (Proxy @LK.DSIGN))
+    stkKey <- genKeyDSIGN <$> genSeed (seedSizeDSIGN (Proxy @LK.DSIGN))
     vrfKey <- genKeyVRF   <$> genSeed (seedSizeVRF   (Proxy @(VRF   c)))
     kesKey <- unsoundPureGenKeyKES <$> genSeed (seedSizeKES   (Proxy @(KES   c)))
     let kesPub = unsoundPureDeriveVerKeyKES kesKey
@@ -412,10 +411,9 @@ mkGenesisConfig pVer k f d maxLovelaceSupply slotLength kesCfg coreNodes =
 mkProtocolShelley ::
      forall m c.
      ( KESAgentContext c m
-     , PraosCrypto c
-     , ShelleyCompatible (TPraos c) (ShelleyEra c)
+     , ShelleyCompatible (TPraos c) ShelleyEra
      )
-  => ShelleyGenesis c
+  => ShelleyGenesis
   -> SL.Nonce
   -> ProtVer
   -> CoreNode c

ouroboros-consensus-cardano/test/cardano-test/Test/ThreadNet/Cardano.hs

@@ -41,6 +41,7 @@ import           Ouroboros.Consensus.Byron.Ledger.Block (ByronBlock)
 import           Ouroboros.Consensus.Byron.Ledger.Conversions
 import           Ouroboros.Consensus.Byron.Node
 import           Ouroboros.Consensus.Cardano.Block
+import           Ouroboros.Consensus.Cardano.CanHardFork
 import           Ouroboros.Consensus.Cardano.Condense ()
 import           Ouroboros.Consensus.Config.SecurityParam
 import           Ouroboros.Consensus.HardFork.Combinator
@@ -438,7 +439,7 @@ prop_simple_cardano_convergence TestSetup
         property $ unNonZero (maxRollbacks setupK) >= finalIntersectionDepth
 
 mkProtocolCardanoAndHardForkTxs ::
-     forall c m. (KESAgentContext c m, c ~ StandardCrypto)
+     forall c m. (CardanoHardForkConstraints c, KESAgentContext c m)
      -- Byron
   => PBftParams
   -> CoreNodeId

ouroboros-consensus-protocol/src/ouroboros-consensus-protocol/Ouroboros/Consensus/Protocol/TPraos.hs

@@ -9,7 +9,6 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE TypeOperators #-}
 
 -- | Transitional Praos.
 --

ouroboros-consensus-protocol/src/unstable-protocol-testlib/Test/Consensus/Protocol/Serialisation/Generators.hs

@@ -1,6 +1,4 @@
-{-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE UndecidableInstances #-}
 
 {-# OPTIONS_GHC -Wno-orphans #-}
 
@@ -29,7 +27,7 @@ import           Test.QuickCheck (Arbitrary (..), Gen, choose, oneof)
 instance Arbitrary InputVRF where
   arbitrary = mkInputVRF <$> arbitrary <*> arbitrary
 
-instance (Praos.PraosCrypto c) => Arbitrary (HeaderBody c) where
+instance Praos.PraosCrypto c => Arbitrary (HeaderBody c) where
   arbitrary =
     let ocert =
           OCert
@@ -57,7 +55,7 @@ instance (Praos.PraosCrypto c) => Arbitrary (HeaderBody c) where
           <*> ocert
           <*> arbitrary
 
-instance (Praos.PraosCrypto c) => Arbitrary (Header c) where
+instance Praos.PraosCrypto c => Arbitrary (Header c) where
   arbitrary = do
     hBody <- arbitrary
     period <- arbitrary