Rename keyrole CommitteeColdKey to ColdCommitteeRole

IntersectMBO · Jul 29, 2023 · 926ac4e · 926ac4e
1 parent 8830757
commit 926ac4e
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/eras/conway/impl/src/Cardano/Ledger/Conway/Rules/GovCert.hs b/eras/conway/impl/src/Cardano/Ledger/Conway/Rules/GovCert.hs
@@ -30,7 +30,7 @@ import Cardano.Ledger.Conway.TxCert (ConwayGovCert (..))
 import Cardano.Ledger.Core (Era (EraCrypto), EraPParams, EraRule, PParams)
 import Cardano.Ledger.Credential (Credential)
 import Cardano.Ledger.Crypto (Crypto)
-import Cardano.Ledger.Keys (KeyRole (CommitteeColdKey, DRepRole))
+import Cardano.Ledger.Keys (KeyRole (ColdCommitteeRole, DRepRole))
 import Control.DeepSeq (NFData)
 import Control.State.Transition.Extended (
  BaseM,
@@ -58,7 +58,7 @@ data ConwayGovCertPredFailure era
  = ConwayDRepAlreadyRegistered !(Credential 'DRepRole (EraCrypto era))
  | ConwayDRepNotRegistered !(Credential 'DRepRole (EraCrypto era))
  | ConwayDRepIncorrectDeposit !Coin
- | ConwayCommitteeHasResigned !(Credential 'CommitteeColdKey (EraCrypto era))
+ | ConwayCommitteeHasResigned !(Credential 'ColdCommitteeRole (EraCrypto era))
  deriving (Show, Eq, Generic)
 
 instance NoThunks (ConwayGovCertPredFailure era)

diff --git a/eras/conway/impl/src/Cardano/Ledger/Conway/TxCert.hs b/eras/conway/impl/src/Cardano/Ledger/Conway/TxCert.hs
@@ -140,12 +140,12 @@ class ShelleyEraTxCert era => ConwayEraTxCert era where
  TxCert era -> Maybe (StakeCredential (EraCrypto era), Delegatee (EraCrypto era), Coin)
 
  mkAuthCommitteeHotKeyTxCert ::
- Credential 'CommitteeColdKey (EraCrypto era) -> Credential 'HotCommitteeRole (EraCrypto era) -> TxCert era
+ Credential 'ColdCommitteeRole (EraCrypto era) -> Credential 'HotCommitteeRole (EraCrypto era) -> TxCert era
  getAuthCommitteeHotKeyTxCert ::
- TxCert era -> Maybe (Credential 'CommitteeColdKey (EraCrypto era), Credential 'HotCommitteeRole (EraCrypto era))
+ TxCert era -> Maybe (Credential 'ColdCommitteeRole (EraCrypto era), Credential 'HotCommitteeRole (EraCrypto era))
 
- mkResignCommitteeColdTxCert :: Credential 'CommitteeColdKey (EraCrypto era) -> TxCert era
- getResignCommitteeColdTxCert :: TxCert era -> Maybe (Credential 'CommitteeColdKey (EraCrypto era))
+ mkResignCommitteeColdTxCert :: Credential 'ColdCommitteeRole (EraCrypto era) -> TxCert era
+ getResignCommitteeColdTxCert :: TxCert era -> Maybe (Credential 'ColdCommitteeRole (EraCrypto era))
 
  mkRegDRepTxCert :: Credential 'DRepRole (EraCrypto era) -> Coin -> StrictMaybe (Anchor (EraCrypto era)) -> TxCert era
  getRegDRepTxCert :: TxCert era -> Maybe (Credential 'DRepRole (EraCrypto era), Coin, StrictMaybe (Anchor (EraCrypto era)))
@@ -228,7 +228,7 @@ pattern RegDepositDelegTxCert cred d c <- (getRegDepositDelegTxCert -> Just (cre
 
 pattern AuthCommitteeHotKeyTxCert ::
  ConwayEraTxCert era =>
- Credential 'CommitteeColdKey (EraCrypto era) ->
+ Credential 'ColdCommitteeRole (EraCrypto era) ->
  Credential 'HotCommitteeRole (EraCrypto era) ->
  TxCert era
 pattern AuthCommitteeHotKeyTxCert ck hk <- (getAuthCommitteeHotKeyTxCert -> Just (ck, hk))
@@ -237,7 +237,7 @@ pattern AuthCommitteeHotKeyTxCert ck hk <- (getAuthCommitteeHotKeyTxCert -> Just
 
 pattern ResignCommitteeColdTxCert ::
  ConwayEraTxCert era =>
- Credential 'CommitteeColdKey (EraCrypto era) ->
+ Credential 'ColdCommitteeRole (EraCrypto era) ->
  TxCert era
 pattern ResignCommitteeColdTxCert ck <- (getResignCommitteeColdTxCert -> Just ck)
  where
@@ -321,8 +321,8 @@ instance NoThunks (ConwayDelegCert c)
 data ConwayGovCert c
  = ConwayRegDRep !(Credential 'DRepRole c) !Coin !(StrictMaybe (Anchor c))
  | ConwayUnRegDRep !(Credential 'DRepRole c) !Coin
- | ConwayAuthCommitteeHotKey !(Credential 'CommitteeColdKey c) !(Credential 'HotCommitteeRole c)
- | ConwayResignCommitteeColdKey !(Credential 'CommitteeColdKey c)
+ | ConwayAuthCommitteeHotKey !(Credential 'ColdCommitteeRole c) !(Credential 'HotCommitteeRole c)
+ | ConwayResignCommitteeColdKey !(Credential 'ColdCommitteeRole c)
  deriving (Show, Generic, Eq)
 
 instance Crypto c => NFData (ConwayGovCert c)

diff --git a/libs/cardano-ledger-core/src/Cardano/Ledger/CertState.hs b/libs/cardano-ledger-core/src/Cardano/Ledger/CertState.hs
@@ -279,7 +279,7 @@ data VState era = VState
  { vsDReps :: !(Set (Credential 'DRepRole (EraCrypto era)))
  , vsCommitteeHotKeys ::
  !( Map
- (Credential 'CommitteeColdKey (EraCrypto era))
+ (Credential 'ColdCommitteeRole (EraCrypto era))
  (Maybe (Credential 'HotCommitteeRole (EraCrypto era))) -- `Nothing` to indicate "resigned".
  )
  }

diff --git a/libs/cardano-ledger-core/src/Cardano/Ledger/Keys.hs b/libs/cardano-ledger-core/src/Cardano/Ledger/Keys.hs
@@ -126,7 +126,7 @@ data KeyRole
  | Witness
  | DRepRole
  | HotCommitteeRole
- | CommitteeColdKey
+ | ColdCommitteeRole
  deriving (Show)
 
 class HasKeyRole (a :: KeyRole -> Type -> Type) where

diff --git a/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Lenses.hs b/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Lenses.hs
@@ -117,7 +117,7 @@ vsDRepsL = lens vsDReps (\vs u -> vs {vsDReps = u})
 vsCommitteeHotKeysL ::
  Lens'
  (VState era)
- (Map (Credential 'CommitteeColdKey (EraCrypto era)) (Maybe (Credential 'HotCommitteeRole (EraCrypto era))))
+ (Map (Credential 'ColdCommitteeRole (EraCrypto era)) (Maybe (Credential 'HotCommitteeRole (EraCrypto era))))
 vsCommitteeHotKeysL = lens vsCommitteeHotKeys (\vs u -> vs {vsCommitteeHotKeys = u})
 
 -- ========================================

diff --git a/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/TypeRep.hs b/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/TypeRep.hs
@@ -116,7 +116,7 @@ data Rep era t where
  GenHashR :: Rep era (KeyHash 'Genesis (EraCrypto era))
  GenDelegHashR :: Rep era (KeyHash 'GenesisDelegate (EraCrypto era))
  VHashR :: Rep era (KeyHash 'DRepRole (EraCrypto era))
- CommColdHashR :: Rep era (Credential 'CommitteeColdKey (EraCrypto era))
+ CommColdHashR :: Rep era (Credential 'ColdCommitteeRole (EraCrypto era))
  CommHotHashR :: Rep era (Credential 'HotCommitteeRole (EraCrypto era))
  PoolParamsR :: Rep era (PoolParams (EraCrypto era))
  NewEpochStateR :: Rep era (NewEpochState era)

diff --git a/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Vars.hs b/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Vars.hs
@@ -226,10 +226,10 @@ dreps = Var $ V "dreps" (SetR VCredR) (Yes NewEpochStateR drepsL)
 drepsL :: NELens era (Set (Credential 'DRepRole (EraCrypto era)))
 drepsL = nesEsL . esLStateL . lsCertStateL . certVStateL . vsDRepsL
 
-ccHotKeys :: Term era (Map (Credential 'CommitteeColdKey (EraCrypto era)) (Maybe (Credential 'HotCommitteeRole (EraCrypto era))))
+ccHotKeys :: Term era (Map (Credential 'ColdCommitteeRole (EraCrypto era)) (Maybe (Credential 'HotCommitteeRole (EraCrypto era))))
 ccHotKeys = Var $ V "dreps" (MapR CommColdHashR (MaybeR CommHotHashR)) (Yes NewEpochStateR ccHotKeysL)
 
-ccHotKeysL :: NELens era (Map (Credential 'CommitteeColdKey (EraCrypto era)) (Maybe (Credential 'HotCommitteeRole (EraCrypto era))))
+ccHotKeysL :: NELens era (Map (Credential 'ColdCommitteeRole (EraCrypto era)) (Maybe (Credential 'HotCommitteeRole (EraCrypto era))))
 ccHotKeysL = nesEsL . esLStateL . lsCertStateL . certVStateL . vsCommitteeHotKeysL
 
 -- UTxOState