Rename TxCertGenesisDeleg pattern to GenesisDelegTxCert

eras/allegra/impl/src/Cardano/Ledger/Allegra/TxCert.hs

@@ -44,10 +44,10 @@ instance Crypto c => ShelleyEraTxCert (AllegraEra c) where
   getDelegStakeTxCert (ShelleyTxCertDelegCert (ShelleyDelegCert c kh)) = Just (c, kh)
   getDelegStakeTxCert _ = Nothing
 
-  mkTxCertGenesisDeleg = ShelleyTxCertGenesisDeleg
+  mkGenesisDelegTxCert = ShelleyTxCertGenesisDeleg
 
-  getTxCertGenesisDeleg (ShelleyTxCertGenesisDeleg c) = Just c
-  getTxCertGenesisDeleg _ = Nothing
+  getGenesisDelegTxCert (ShelleyTxCertGenesisDeleg c) = Just c
+  getGenesisDelegTxCert _ = Nothing
 
   mkTxCertMir = ShelleyTxCertMir
 

eras/alonzo/impl/src/Cardano/Ledger/Alonzo/TxCert.hs

@@ -44,10 +44,10 @@ instance Crypto c => ShelleyEraTxCert (AlonzoEra c) where
   getDelegStakeTxCert (ShelleyTxCertDelegCert (ShelleyDelegCert c kh)) = Just (c, kh)
   getDelegStakeTxCert _ = Nothing
 
-  mkTxCertGenesisDeleg = ShelleyTxCertGenesisDeleg
+  mkGenesisDelegTxCert = ShelleyTxCertGenesisDeleg
 
-  getTxCertGenesisDeleg (ShelleyTxCertGenesisDeleg c) = Just c
-  getTxCertGenesisDeleg _ = Nothing
+  getGenesisDelegTxCert (ShelleyTxCertGenesisDeleg c) = Just c
+  getGenesisDelegTxCert _ = Nothing
 
   mkTxCertMir = ShelleyTxCertMir
 

eras/babbage/impl/src/Cardano/Ledger/Babbage/TxCert.hs

@@ -44,10 +44,10 @@ instance Crypto c => ShelleyEraTxCert (BabbageEra c) where
   getDelegStakeTxCert (ShelleyTxCertDelegCert (ShelleyDelegCert c kh)) = Just (c, kh)
   getDelegStakeTxCert _ = Nothing
 
-  mkTxCertGenesisDeleg = ShelleyTxCertGenesisDeleg
+  mkGenesisDelegTxCert = ShelleyTxCertGenesisDeleg
 
-  getTxCertGenesisDeleg (ShelleyTxCertGenesisDeleg c) = Just c
-  getTxCertGenesisDeleg _ = Nothing
+  getGenesisDelegTxCert (ShelleyTxCertGenesisDeleg c) = Just c
+  getGenesisDelegTxCert _ = Nothing
 
   mkTxCertMir = ShelleyTxCertMir
 

eras/conway/impl/src/Cardano/Ledger/Conway/TxCert.hs

@@ -97,8 +97,8 @@ instance Crypto c => ShelleyEraTxCert (ConwayEra c) where
   getDelegStakeTxCert (ConwayTxCertDeleg (ConwayDelegCert c (DelegStake kh))) = Just (c, kh)
   getDelegStakeTxCert _ = Nothing
 
-  mkTxCertGenesisDeleg = notSupportedInThisEra
-  getTxCertGenesisDeleg _ = Nothing
+  mkGenesisDelegTxCert = notSupportedInThisEra
+  getGenesisDelegTxCert _ = Nothing
 
   mkTxCertMir = notSupportedInThisEra
   getTxCertMir = const Nothing

eras/mary/impl/src/Cardano/Ledger/Mary/TxCert.hs

@@ -52,10 +52,10 @@ instance Crypto c => ShelleyEraTxCert (MaryEra c) where
   getDelegStakeTxCert (ShelleyTxCertDelegCert (ShelleyDelegCert c kh)) = Just (c, kh)
   getDelegStakeTxCert _ = Nothing
 
-  mkTxCertGenesisDeleg = ShelleyTxCertGenesisDeleg
+  mkGenesisDelegTxCert = ShelleyTxCertGenesisDeleg
 
-  getTxCertGenesisDeleg (ShelleyTxCertGenesisDeleg c) = Just c
-  getTxCertGenesisDeleg _ = Nothing
+  getGenesisDelegTxCert (ShelleyTxCertGenesisDeleg c) = Just c
+  getGenesisDelegTxCert _ = Nothing
 
   mkTxCertMir = ShelleyTxCertMir
 

eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Deleg.hs

@@ -57,10 +57,9 @@ import Cardano.Ledger.Shelley.TxBody (
   Ptr,
  )
 import Cardano.Ledger.Shelley.TxCert (
-  GenesisDelegCert (..),
   pattern DelegStakeTxCert,
+  pattern GenesisDelegTxCert,
   pattern RegTxCert,
-  pattern TxCertGenesisDeleg,
   pattern UnRegTxCert,
  )
 import Cardano.Ledger.Slot (
@@ -295,7 +294,7 @@ delegationTransition = do
       UM.member hk (rewards ds) ?! StakeDelegationImpossibleDELEG hk
 
       pure (ds {dsUnified = delegations ds UM.⨃ Map.singleton hk dpool})
-    TxCertGenesisDeleg (GenesisDelegCert gkh vkh vrf) -> do
+    GenesisDelegTxCert gkh vkh vrf -> do
       sp <- liftSTS $ asks stabilityWindow
       -- note that pattern match is used instead of genesisDeleg, as in the spec
       let s' = slot +* Duration sp

eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Pool.hs

@@ -53,8 +53,8 @@ import Cardano.Ledger.Shelley.TxBody (
 import Cardano.Ledger.Shelley.TxCert (
   isInstantaneousRewards,
   pattern DelegStakeTxCert,
+  pattern GenesisDelegTxCert,
   pattern RegTxCert,
-  pattern TxCertGenesisDeleg,
   pattern UnRegTxCert,
  )
 import Cardano.Ledger.Slot (EpochNo (..), SlotNo, epochInfoEpoch)
@@ -245,7 +245,7 @@ poolDelegationTransition = do
     DelegStakeTxCert _ _ -> do
       failBecause $ WrongCertificateTypePOOL 0
       pure ps
-    TxCertGenesisDeleg _ -> do
+    GenesisDelegTxCert _ _ _ -> do
       failBecause $ WrongCertificateTypePOOL 2
       pure ps
     _ | isInstantaneousRewards c -> do

eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Reports.hs

@@ -34,8 +34,8 @@ import Cardano.Ledger.Shelley.TxBody
 import Cardano.Ledger.Shelley.TxCert (
   isInstantaneousRewards,
   pattern DelegStakeTxCert,
+  pattern GenesisDelegTxCert,
   pattern RegTxCert,
-  pattern TxCertGenesisDeleg,
   pattern UnRegTxCert,
  )
 import Cardano.Ledger.UTxO (UTxO (..))
@@ -57,7 +57,7 @@ synopsisCert x = case x of
   DelegStakeTxCert cred _ -> "ShelleyDelegCert" ++ take 10 (showCred cred)
   RegPoolTxCert pool -> let KeyHash hash = ppId pool in "RegPool " ++ take 10 (show hash)
   RetirePoolTxCert khash e -> "RetirePool " ++ showKeyHash khash ++ " " ++ show e
-  TxCertGenesisDeleg _ -> "GenesisCert"
+  GenesisDelegTxCert _ _ _ -> "GenesisCert"
   _ | isInstantaneousRewards x -> "MirCert"
   _ -> error "Impossible"
 

eras/shelley/impl/src/Cardano/Ledger/Shelley/TxCert.hs

@@ -25,7 +25,7 @@
 module Cardano.Ledger.Shelley.TxCert (
   ShelleyEraTxCert (..),
   pattern TxCertMir,
-  pattern TxCertGenesisDeleg,
+  pattern GenesisDelegTxCert,
   pattern RegTxCert,
   pattern UnRegTxCert,
   pattern DelegStakeTxCert,
@@ -123,7 +123,6 @@ instance Crypto c => EraTxCert (ShelleyEra c) where
   getRetirePoolTxCert _ = Nothing
 
 class EraTxCert era => ShelleyEraTxCert era where
-
   mkRegTxCert :: StakeCredential (EraCrypto era) -> TxCert era
   getRegTxCert :: TxCert era -> Maybe (StakeCredential (EraCrypto era))
 
@@ -135,8 +134,8 @@ class EraTxCert era => ShelleyEraTxCert era where
   getDelegStakeTxCert ::
     TxCert era -> Maybe (StakeCredential (EraCrypto era), KeyHash 'StakePool (EraCrypto era))
 
-  mkTxCertGenesisDeleg :: GenesisDelegCert (EraCrypto era) -> TxCert era
-  getTxCertGenesisDeleg :: TxCert era -> Maybe (GenesisDelegCert (EraCrypto era))
+  mkGenesisDelegTxCert :: GenesisDelegCert (EraCrypto era) -> TxCert era
+  getGenesisDelegTxCert :: TxCert era -> Maybe (GenesisDelegCert (EraCrypto era))
 
   mkTxCertMir :: ProtVerAtMost era 8 => MIRCert (EraCrypto era) -> TxCert era
   getTxCertMir :: TxCert era -> Maybe (MIRCert (EraCrypto era))
@@ -159,10 +158,10 @@ instance Crypto c => ShelleyEraTxCert (ShelleyEra c) where
   getDelegStakeTxCert (ShelleyTxCertDelegCert (ShelleyDelegCert c kh)) = Just (c, kh)
   getDelegStakeTxCert _ = Nothing
 
-  mkTxCertGenesisDeleg = ShelleyTxCertGenesisDeleg
+  mkGenesisDelegTxCert = ShelleyTxCertGenesisDeleg
 
-  getTxCertGenesisDeleg (ShelleyTxCertGenesisDeleg c) = Just c
-  getTxCertGenesisDeleg _ = Nothing
+  getGenesisDelegTxCert (ShelleyTxCertGenesisDeleg c) = Just c
+  getGenesisDelegTxCert _ = Nothing
 
   mkTxCertMir = ShelleyTxCertMir
 
@@ -193,13 +192,17 @@ pattern TxCertMir d <- (getTxCertMir -> Just d)
   where
     TxCertMir d = mkTxCertMir d
 
-pattern TxCertGenesisDeleg ::
+pattern GenesisDelegTxCert ::
   ShelleyEraTxCert era =>
-  GenesisDelegCert (EraCrypto era) ->
+  KeyHash 'Genesis (EraCrypto era) ->
+  KeyHash 'GenesisDelegate (EraCrypto era) ->
+  Hash (EraCrypto era) (VerKeyVRF (EraCrypto era)) ->
   TxCert era
-pattern TxCertGenesisDeleg d <- (getTxCertGenesisDeleg -> Just d)
+pattern GenesisDelegTxCert genKey genDelegKey vrf <-
+  (getGenesisDelegTxCert -> Just (GenesisDelegCert genKey genDelegKey vrf))
   where
-    TxCertGenesisDeleg d = mkTxCertGenesisDeleg d
+    GenesisDelegTxCert genKey genDelegKey vrf =
+      mkGenesisDelegTxCert $ GenesisDelegCert genKey genDelegKey vrf
 
 -- | Genesis key delegation certificate
 data GenesisDelegCert c
@@ -348,10 +351,10 @@ instance
       | 0 <= t && t < 3 -> shelleyTxCertDelegDecoder t
       | 3 <= t && t < 5 -> poolTxCertDecoder t
     5 -> do
-      a <- decCBOR
-      b <- decCBOR
-      c <- decCBOR
-      pure (4, TxCertGenesisDeleg $ GenesisDelegCert a b c)
+      gen <- decCBOR
+      genDeleg <- decCBOR
+      vrf <- decCBOR
+      pure (4, GenesisDelegTxCert gen genDeleg vrf)
     6 -> do
       x <- decCBOR
       pure (2, ShelleyTxCertMir x)
@@ -446,7 +449,7 @@ isDelegation _ = False
 
 -- | Check for 'GenesisDelegate' constructor
 isGenesisDelegation :: ShelleyEraTxCert era => TxCert era -> Bool
-isGenesisDelegation = isJust . getTxCertGenesisDeleg
+isGenesisDelegation = isJust . getGenesisDelegTxCert
 
 -- | Check for 'RegPool' constructor
 isRegPool :: EraTxCert era => TxCert era -> Bool

eras/shelley/test-suite/src/Test/Cardano/Ledger/Shelley/Generator/TxCert.hs

@@ -49,10 +49,9 @@ import Cardano.Ledger.Shelley.Core
 import qualified Cardano.Ledger.Shelley.HardForks as HardForks
 import Cardano.Ledger.Shelley.LedgerState (availableAfterMIR, rewards)
 import Cardano.Ledger.Shelley.TxCert (
-  GenesisDelegCert (..),
   pattern DelegStakeTxCert,
+  pattern GenesisDelegTxCert,
   pattern RegTxCert,
-  pattern TxCertGenesisDeleg,
   pattern UnRegTxCert,
  )
 import Cardano.Ledger.Slot (EpochNo (EpochNo), SlotNo)
@@ -346,12 +345,10 @@ genGenesisDelegation coreNodes delegateKeys dpState =
     hashVKey = hashKey . vKey
     mkCert gkey key vrf =
       Just
-        ( TxCertGenesisDeleg
-            ( GenesisDelegCert
-                (hashVKey gkey)
-                (hashVKey key)
-                (hashVerKeyVRF vrf)
-            )
+        ( GenesisDelegTxCert
+            (hashVKey gkey)
+            (hashVKey key)
+            (hashVerKeyVRF vrf)
         , CoreKeyCred [gkey]
         )
     GenDelegs genDelegs_ = dsGenDelegs $ certDState dpState

eras/shelley/test-suite/test/Test/Cardano/Ledger/Shelley/Examples/GenesisDelegation.hs

@@ -40,7 +40,7 @@ import Cardano.Ledger.Shelley.TxBody (
   ShelleyTxBody (..),
   ShelleyTxOut (..),
  )
-import Cardano.Ledger.Shelley.TxCert (GenesisDelegCert (..), pattern TxCertGenesisDeleg)
+import Cardano.Ledger.Shelley.TxCert (pattern GenesisDelegTxCert)
 import Cardano.Ledger.Shelley.TxWits (ShelleyTxWits, addrWits)
 import Cardano.Ledger.Slot (BlockNo (..), SlotNo (..))
 import Cardano.Ledger.TxIn (TxIn (..))
@@ -133,12 +133,10 @@ txbodyEx1 =
     (Set.fromList [TxIn genesisId minBound])
     (StrictSeq.singleton $ ShelleyTxOut Cast.aliceAddr aliceCoinEx1)
     ( StrictSeq.fromList
-        [ TxCertGenesisDeleg
-            ( GenesisDelegCert
-                (hashKey (coreNodeVK 0))
-                (hashKey (vKey newGenDelegate))
-                (newGenesisVrfKH @c)
-            )
+        [ GenesisDelegTxCert
+            (hashKey (coreNodeVK 0))
+            (hashKey (vKey newGenDelegate))
+            (newGenesisVrfKH @c)
         ]
     )
     (Withdrawals Map.empty)

eras/shelley/test-suite/test/Test/Cardano/Ledger/Shelley/Serialisation/Golden/Encoding.hs

@@ -111,10 +111,9 @@ import Cardano.Ledger.Shelley.TxBody (
   pattern RewardAcnt,
  )
 import Cardano.Ledger.Shelley.TxCert (
-  GenesisDelegCert (..),
   pattern DelegStakeTxCert,
+  pattern GenesisDelegTxCert,
   pattern RegTxCert,
-  pattern TxCertGenesisDeleg,
   pattern TxCertMir,
   pattern UnRegTxCert,
  )
@@ -622,12 +621,10 @@ tests =
     , checkEncodingCBOR
         shelleyProtVer
         "genesis_delegation"
-        ( TxCertGenesisDeleg @C
-            ( GenesisDelegCert @C_Crypto
-                testGKeyHash
-                (hashKey . vKey $ testGenesisDelegateKey @C_Crypto)
-                (testVRFKH @C_Crypto)
-            )
+        ( GenesisDelegTxCert @C
+            testGKeyHash
+            (hashKey . vKey $ testGenesisDelegateKey @C_Crypto)
+            (testVRFKH @C_Crypto)
         )
         ( T
             ( TkListLen 4