Merge pull request #181 from input-output-hk/newhoggy/queryGenesisPar…

…ameters-in-shelley-era-only Modify `queryGenesisParameters` so that its type advertises it only returns genesis parameters for the Shelley era
IntersectMBO · Aug 10, 2023 · 7f6d56d · 7f6d56d
2 parents 3e3222c + f3d3b46
commit 7f6d56d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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