Skip to content

Commit

Permalink
Rename TxCertMir pattern to MirTxCert
Browse files Browse the repository at this point in the history
for consistency
  • Loading branch information
teodanciu committed May 30, 2023
1 parent 520aaf0 commit 6a0fa94
Show file tree
Hide file tree
Showing 14 changed files with 39 additions and 39 deletions.
6 changes: 3 additions & 3 deletions eras/allegra/impl/src/Cardano/Ledger/Allegra/TxCert.hs
Expand Up @@ -49,7 +49,7 @@ instance Crypto c => ShelleyEraTxCert (AllegraEra c) where
getGenesisDelegTxCert (ShelleyTxCertGenesisDeleg c) = Just c
getGenesisDelegTxCert _ = Nothing

mkTxCertMir = ShelleyTxCertMir
mkMirTxCert = ShelleyTxCertMir

getTxCertMir (ShelleyTxCertMir c) = Just c
getTxCertMir _ = Nothing
getMirTxCert (ShelleyTxCertMir c) = Just c
getMirTxCert _ = Nothing
6 changes: 3 additions & 3 deletions eras/alonzo/impl/src/Cardano/Ledger/Alonzo/TxCert.hs
Expand Up @@ -49,7 +49,7 @@ instance Crypto c => ShelleyEraTxCert (AlonzoEra c) where
getGenesisDelegTxCert (ShelleyTxCertGenesisDeleg c) = Just c
getGenesisDelegTxCert _ = Nothing

mkTxCertMir = ShelleyTxCertMir
mkMirTxCert = ShelleyTxCertMir

getTxCertMir (ShelleyTxCertMir c) = Just c
getTxCertMir _ = Nothing
getMirTxCert (ShelleyTxCertMir c) = Just c
getMirTxCert _ = Nothing
6 changes: 3 additions & 3 deletions eras/babbage/impl/src/Cardano/Ledger/Babbage/TxCert.hs
Expand Up @@ -49,7 +49,7 @@ instance Crypto c => ShelleyEraTxCert (BabbageEra c) where
getGenesisDelegTxCert (ShelleyTxCertGenesisDeleg c) = Just c
getGenesisDelegTxCert _ = Nothing

mkTxCertMir = ShelleyTxCertMir
mkMirTxCert = ShelleyTxCertMir

getTxCertMir (ShelleyTxCertMir c) = Just c
getTxCertMir _ = Nothing
getMirTxCert (ShelleyTxCertMir c) = Just c
getMirTxCert _ = Nothing
4 changes: 2 additions & 2 deletions eras/conway/impl/src/Cardano/Ledger/Conway/TxCert.hs
Expand Up @@ -100,8 +100,8 @@ instance Crypto c => ShelleyEraTxCert (ConwayEra c) where
mkGenesisDelegTxCert = notSupportedInThisEra
getGenesisDelegTxCert _ = Nothing

mkTxCertMir = notSupportedInThisEra
getTxCertMir = const Nothing
mkMirTxCert = notSupportedInThisEra
getMirTxCert = const Nothing

class ShelleyEraTxCert era => ConwayEraTxCert era where
mkConwayTxCertDeleg :: ConwayDelegCert (EraCrypto era) -> TxCert era
Expand Down
6 changes: 3 additions & 3 deletions eras/mary/impl/src/Cardano/Ledger/Mary/TxCert.hs
Expand Up @@ -57,7 +57,7 @@ instance Crypto c => ShelleyEraTxCert (MaryEra c) where
getGenesisDelegTxCert (ShelleyTxCertGenesisDeleg c) = Just c
getGenesisDelegTxCert _ = Nothing

mkTxCertMir = ShelleyTxCertMir
mkMirTxCert = ShelleyTxCertMir

getTxCertMir (ShelleyTxCertMir c) = Just c
getTxCertMir _ = Nothing
getMirTxCert (ShelleyTxCertMir c) = Just c
getMirTxCert _ = Nothing
2 changes: 1 addition & 1 deletion eras/shelley/impl/src/Cardano/Ledger/Shelley/Core.hs
Expand Up @@ -8,7 +8,7 @@

module Cardano.Ledger.Shelley.Core (
ShelleyEraTxBody (..),
pattern TxCertMir,
pattern MirTxCert,
ShelleyEraTxCert (..),
Withdrawals (..),
Wdrl,
Expand Down
Expand Up @@ -327,7 +327,7 @@ delegationTransition = do
RegPoolTxCert _ -> do
failBecause WrongCertificateTypeDELEG -- this always fails
pure ds
_ | Just (MIRCert targetPot mirTarget) <- getTxCertMir c -> do
_ | Just (MIRCert targetPot mirTarget) <- getMirTxCert c -> do
checkSlotNotTooLate slot
case mirTarget of
StakeAddressesMIR credCoinMap -> do
Expand Down
26 changes: 13 additions & 13 deletions eras/shelley/impl/src/Cardano/Ledger/Shelley/TxCert.hs
Expand Up @@ -24,7 +24,7 @@

module Cardano.Ledger.Shelley.TxCert (
ShelleyEraTxCert (..),
pattern TxCertMir,
pattern MirTxCert,
pattern GenesisDelegTxCert,
pattern RegTxCert,
pattern UnRegTxCert,
Expand Down Expand Up @@ -137,8 +137,8 @@ class EraTxCert era => ShelleyEraTxCert era where
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))
mkMirTxCert :: ProtVerAtMost era 8 => MIRCert (EraCrypto era) -> TxCert era
getMirTxCert :: TxCert era -> Maybe (MIRCert (EraCrypto era))

instance Crypto c => ShelleyEraTxCert (ShelleyEra c) where
{-# SPECIALIZE instance ShelleyEraTxCert (ShelleyEra StandardCrypto) #-}
Expand All @@ -163,10 +163,10 @@ instance Crypto c => ShelleyEraTxCert (ShelleyEra c) where
getGenesisDelegTxCert (ShelleyTxCertGenesisDeleg c) = Just c
getGenesisDelegTxCert _ = Nothing

mkTxCertMir = ShelleyTxCertMir
mkMirTxCert = ShelleyTxCertMir

getTxCertMir (ShelleyTxCertMir c) = Just c
getTxCertMir _ = Nothing
getMirTxCert (ShelleyTxCertMir c) = Just c
getMirTxCert _ = Nothing

pattern RegTxCert :: ShelleyEraTxCert era => StakeCredential (EraCrypto era) -> TxCert era
pattern RegTxCert c <- (getRegTxCert -> Just c)
Expand All @@ -187,10 +187,10 @@ pattern DelegStakeTxCert c kh <- (getDelegStakeTxCert -> Just (c, kh))
where
DelegStakeTxCert c kh = mkDelegStakeTxCert c kh

pattern TxCertMir :: (ShelleyEraTxCert era, ProtVerAtMost era 8) => MIRCert (EraCrypto era) -> TxCert era
pattern TxCertMir d <- (getTxCertMir -> Just d)
pattern MirTxCert :: (ShelleyEraTxCert era, ProtVerAtMost era 8) => MIRCert (EraCrypto era) -> TxCert era
pattern MirTxCert d <- (getMirTxCert -> Just d)
where
TxCertMir d = mkTxCertMir d
MirTxCert d = mkMirTxCert d

pattern GenesisDelegTxCert ::
ShelleyEraTxCert era =>
Expand Down Expand Up @@ -462,15 +462,15 @@ isRetirePool (RetirePoolTxCert _ _) = True
isRetirePool _ = False

isInstantaneousRewards :: ShelleyEraTxCert era => TxCert era -> Bool
isInstantaneousRewards = isJust . getTxCertMir
isInstantaneousRewards = isJust . getMirTxCert

isReservesMIRCert :: ShelleyEraTxCert era => TxCert era -> Bool
isReservesMIRCert x = case getTxCertMir x of
isReservesMIRCert x = case getMirTxCert x of
Just (MIRCert ReservesMIR _) -> True
_ -> False

isTreasuryMIRCert :: ShelleyEraTxCert era => TxCert era -> Bool
isTreasuryMIRCert x = case getTxCertMir x of
isTreasuryMIRCert x = case getMirTxCert x of
Just (MIRCert TreasuryMIR _) -> True
_ -> False

Expand All @@ -482,7 +482,7 @@ isTreasuryMIRCert x = case getTxCertMir x of
-- `getVKeyWitnessTxCert` instead.
requiresVKeyWitness :: (ShelleyEraTxCert era, ProtVerAtMost era 8) => TxCert era -> Bool
requiresVKeyWitness (RegTxCert _) = False
requiresVKeyWitness x = isNothing $ getTxCertMir x
requiresVKeyWitness x = isNothing $ getMirTxCert x
{-# DEPRECATED requiresVKeyWitness "In favor of `getVKeyWitnessTxCert`" #-}

getScriptWitnessShelleyTxCert ::
Expand Down
Expand Up @@ -472,7 +472,7 @@ exampleCerts =
StrictSeq.fromList
[ RegTxCert (keyToCredential exampleStakeKey)
, RegPoolTxCert examplePoolParams
, TxCertMir $
, MirTxCert $
MIRCert ReservesMIR $
StakeAddressesMIR $
Map.fromList
Expand Down
Expand Up @@ -504,7 +504,7 @@ genInstantaneousRewardsAccounts s genesisDelegatesByHash pparams accountState de
then Nothing
else
Just
( TxCertMir (MIRCert pot (StakeAddressesMIR credCoinMap))
( MirTxCert (MIRCert pot (StakeAddressesMIR credCoinMap))
, DelegateCred (aikCold <$> coreSigners)
)

Expand Down Expand Up @@ -542,7 +542,7 @@ genInstantaneousRewardsTransfer s genesisDelegatesByHash pparams accountState de
then Nothing
else
Just
( TxCertMir (MIRCert pot (SendToOppositePotMIR $ Coin amount))
( MirTxCert (MIRCert pot (SendToOppositePotMIR $ Coin amount))
, DelegateCred (aikCold <$> coreSigners)
)

Expand Down
Expand Up @@ -178,7 +178,7 @@ checkInstantaneousRewards
denv
SourceSignalTarget {source, signal, target} =
case signal of
TxCertMir (MIRCert ReservesMIR (StakeAddressesMIR irwd)) ->
MirTxCert (MIRCert ReservesMIR (StakeAddressesMIR irwd)) ->
conjoin
[ counterexample
"a ReservesMIR certificate should add all entries to the `irwd` mapping"
Expand All @@ -198,7 +198,7 @@ checkInstantaneousRewards
== fold (iRReserves $ dsIRewards target)
)
]
TxCertMir (MIRCert TreasuryMIR (StakeAddressesMIR irwd)) ->
MirTxCert (MIRCert TreasuryMIR (StakeAddressesMIR irwd)) ->
conjoin
[ counterexample
"a TreasuryMIR certificate should add all entries to the `irwd` mapping"
Expand Down
Expand Up @@ -233,7 +233,7 @@ delegTraceFromBlock chainSt block =
delegCert (RegTxCert _) = True
delegCert (UnRegTxCert _) = True
delegCert (DelegStakeTxCert _ _) = True
delegCert (TxCertMir _) = True
delegCert (MirTxCert _) = True
delegCert _ = False

-- | Reconstruct a POOL trace from the transactions in a Block and ChainState
Expand Down
Expand Up @@ -71,12 +71,12 @@ testMirTransfer ::
Assertion
testMirTransfer pv pot target ir acnt (Right expected) = do
checkTrace @(ShelleyDELEG ShelleyTest) runShelleyBase (env pv acnt) $
(pure (def {dsIRewards = ir})) .- (TxCertMir (MIRCert pot target)) .->> (def {dsIRewards = expected})
(pure (def {dsIRewards = ir})) .- (MirTxCert (MIRCert pot target)) .->> (def {dsIRewards = expected})
testMirTransfer pv pot target ir acnt predicateFailure@(Left _) = do
let st =
runShelleyBase $
applySTSTest @(ShelleyDELEG ShelleyTest)
(TRC (env pv acnt, def {dsIRewards = ir}, TxCertMir (MIRCert pot target)))
(TRC (env pv acnt, def {dsIRewards = ir}, MirTxCert (MIRCert pot target)))
(ignoreAllButIRWD st) @?= predicateFailure

alice :: Credential 'Staking C_Crypto
Expand Down
Expand Up @@ -113,8 +113,8 @@ import Cardano.Ledger.Shelley.TxBody (
import Cardano.Ledger.Shelley.TxCert (
pattern DelegStakeTxCert,
pattern GenesisDelegTxCert,
pattern MirTxCert,
pattern RegTxCert,
pattern TxCertMir,
pattern UnRegTxCert,
)
import Cardano.Ledger.Shelley.TxWits (ShelleyTxWits, addrWits, scriptWits)
Expand Down Expand Up @@ -639,7 +639,7 @@ tests =
in checkEncodingCBOR
shelleyProtVer
"mir"
(TxCertMir @C (MIRCert ReservesMIR rws))
(MirTxCert @C (MIRCert ReservesMIR rws))
( T
( TkListLen 2
. TkWord 6 -- make instantaneous rewards cert
Expand Down

0 comments on commit 6a0fa94

Please sign in to comment.