From f3d3b465e0725242f64529ccc273acacdc962766 Mon Sep 17 00:00:00 2001 From: John Ky Date: Thu, 10 Aug 2023 19:29:06 +1000 Subject: [PATCH] Modify queryGenesisParameters so that its type advertises it only returns genesis parameters for the shelley era --- cardano-api/internal/Cardano/Api/Query.hs | 2 +- cardano-api/internal/Cardano/Api/Query/Expr.hs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cardano-api/internal/Cardano/Api/Query.hs b/cardano-api/internal/Cardano/Api/Query.hs index 89ace16717..b2ea1dac35 100644 --- a/cardano-api/internal/Cardano/Api/Query.hs +++ b/cardano-api/internal/Cardano/Api/Query.hs @@ -240,7 +240,7 @@ data QueryInShelleyBasedEra era result where :: QueryInShelleyBasedEra era EpochNo QueryGenesisParameters - :: QueryInShelleyBasedEra era GenesisParameters + :: QueryInShelleyBasedEra ShelleyEra GenesisParameters QueryProtocolParameters :: QueryInShelleyBasedEra era ProtocolParameters diff --git a/cardano-api/internal/Cardano/Api/Query/Expr.hs b/cardano-api/internal/Cardano/Api/Query/Expr.hs index 4835c13704..70b3f601c2 100644 --- a/cardano-api/internal/Cardano/Api/Query/Expr.hs +++ b/cardano-api/internal/Cardano/Api/Query/Expr.hs @@ -41,7 +41,7 @@ import Cardano.Api.ProtocolParameters import Cardano.Api.Query import Cardano.Api.Value -import Cardano.Ledger.Api +import qualified Cardano.Ledger.Api as L import Cardano.Ledger.SafeHash import Cardano.Slotting.Slot import Ouroboros.Consensus.HardFork.Combinator.AcrossEras as Consensus @@ -93,8 +93,8 @@ queryEraHistory = queryExpr $ QueryEraHistory CardanoModeIsMultiEra queryGenesisParameters :: () - => EraInMode era mode - -> ShelleyBasedEra era + => EraInMode ShelleyEra mode + -> ShelleyBasedEra ShelleyEra -> LocalStateQueryExpr block point (QueryInMode mode) r IO (Either UnsupportedNtcVersionError (Either EraMismatch GenesisParameters)) queryGenesisParameters eraInMode sbe = queryExpr $ QueryInEra eraInMode $ QueryInShelleyBasedEra sbe QueryGenesisParameters @@ -133,7 +133,7 @@ queryProtocolParameters eraInMode sbe = queryConstitutionHash :: () => EraInMode era mode -> ShelleyBasedEra era - -> LocalStateQueryExpr block point (QueryInMode mode) r IO (Either UnsupportedNtcVersionError (Either EraMismatch (Maybe (SafeHash (EraCrypto (ShelleyLedgerEra era)) ByteString)))) + -> LocalStateQueryExpr block point (QueryInMode mode) r IO (Either UnsupportedNtcVersionError (Either EraMismatch (Maybe (SafeHash (L.EraCrypto (ShelleyLedgerEra era)) ByteString)))) queryConstitutionHash eraInMode sbe = queryExpr $ QueryInEra eraInMode $ QueryInShelleyBasedEra sbe QueryConstitutionHash