From 504bca6a3875d06c00762c2b8f84aeec7694b5f8 Mon Sep 17 00:00:00 2001 From: Carl Hammann Date: Mon, 6 Nov 2023 16:36:17 +0100 Subject: [PATCH 1/2] Leftover from #352: forgot to expose new module --- cardano-api-gen/cardano-api-gen.cabal | 15 ++++++++------- cardano-api/cardano-api.cabal | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cardano-api-gen/cardano-api-gen.cabal b/cardano-api-gen/cardano-api-gen.cabal index 58ddce26f1..f59035a979 100644 --- a/cardano-api-gen/cardano-api-gen.cabal +++ b/cardano-api-gen/cardano-api-gen.cabal @@ -37,10 +37,11 @@ library hs-source-dirs: src -- These modules should match those in cardano-api:gen exposed-modules: Test.Gen.Cardano.Api.Empty - reexported-modules: Test.Gen.Cardano.Api, - Test.Gen.Cardano.Api.Metadata, - Test.Gen.Cardano.Api.Typed, - Test.Gen.Cardano.Crypto.Seed, - Test.Hedgehog.Golden.ErrorMessage, - Test.Hedgehog.Roundtrip.Bech32, - Test.Hedgehog.Roundtrip.CBOR, + reexported-modules: Test.Gen.Cardano.Api + , Test.Gen.Cardano.Api.Metadata + , Test.Gen.Cardano.Api.ProtocolParameters + , Test.Gen.Cardano.Api.Typed + , Test.Gen.Cardano.Crypto.Seed + , Test.Hedgehog.Golden.ErrorMessage + , Test.Hedgehog.Roundtrip.Bech32 + , Test.Hedgehog.Roundtrip.CBOR diff --git a/cardano-api/cardano-api.cabal b/cardano-api/cardano-api.cabal index 801a43cff7..43719d29fd 100644 --- a/cardano-api/cardano-api.cabal +++ b/cardano-api/cardano-api.cabal @@ -248,6 +248,7 @@ library gen Test.Gen.Cardano.Api.Era Test.Gen.Cardano.Api.Metadata Test.Gen.Cardano.Api.Typed + Test.Gen.Cardano.Api.ProtocolParameters Test.Gen.Cardano.Crypto.Seed Test.Hedgehog.Golden.ErrorMessage Test.Hedgehog.Roundtrip.Bech32 From 1df547cd5910b511d13050a19c54bd5d3c91b629 Mon Sep 17 00:00:00 2001 From: Carl Hammann Date: Tue, 14 Nov 2023 13:30:08 +0100 Subject: [PATCH 2/2] Adapt generators to changed types --- cardano-api/cardano-api.cabal | 2 +- .../gen/Test/Gen/Cardano/Api/ProtocolParameters.hs | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cardano-api/cardano-api.cabal b/cardano-api/cardano-api.cabal index 43719d29fd..6e614e7983 100644 --- a/cardano-api/cardano-api.cabal +++ b/cardano-api/cardano-api.cabal @@ -262,7 +262,7 @@ library gen , cardano-binary >= 1.6 && < 1.8 , cardano-crypto-class ^>= 2.1.2 , cardano-crypto-test ^>= 1.5 - , cardano-ledger-alonzo:{cardano-ledger-alonzo} >= 1.5.0 + , cardano-ledger-alonzo:{cardano-ledger-alonzo, testlib} >= 1.5.0 , cardano-ledger-byron-test >= 1.5 , cardano-ledger-core:{cardano-ledger-core, testlib} >= 1.8.0 , cardano-ledger-shelley >= 1.7.0 diff --git a/cardano-api/gen/Test/Gen/Cardano/Api/ProtocolParameters.hs b/cardano-api/gen/Test/Gen/Cardano/Api/ProtocolParameters.hs index 57538db646..8a0d0cf7ee 100644 --- a/cardano-api/gen/Test/Gen/Cardano/Api/ProtocolParameters.hs +++ b/cardano-api/gen/Test/Gen/Cardano/Api/ProtocolParameters.hs @@ -37,11 +37,13 @@ genCommonProtocolParametersUpdate = <*> genStrictMaybe Q.arbitrary <*> genStrictMaybe Q.arbitrary <*> genStrictMaybe Q.arbitrary - <*> genStrictMaybe Q.arbitrary genDeprecatedAfterMaryPParams :: MonadGen m => m (DeprecatedAfterMaryPParams era) genDeprecatedAfterMaryPParams = DeprecatedAfterMaryPParams <$> genStrictMaybe Q.arbitrary +genDeprecatedAfterBabbagePParams :: MonadGen m => m (DeprecatedAfterBabbagePParams era) +genDeprecatedAfterBabbagePParams = DeprecatedAfterBabbagePParams <$> genStrictMaybe Q.arbitrary + genShelleyToAlonzoPParams :: MonadGen m => m (ShelleyToAlonzoPParams era) genShelleyToAlonzoPParams = ShelleyToAlonzoPParams @@ -79,6 +81,7 @@ genShelleyEraBasedProtocolParametersUpdate = ShelleyEraBasedProtocolParametersUpdate <$> genCommonProtocolParametersUpdate <*> genDeprecatedAfterMaryPParams + <*> genDeprecatedAfterBabbagePParams <*> genShelleyToAlonzoPParams genAllegraEraBasedProtocolParametersUpdate :: MonadGen m => m (EraBasedProtocolParametersUpdate AllegraEra) @@ -87,6 +90,7 @@ genAllegraEraBasedProtocolParametersUpdate = <$> genCommonProtocolParametersUpdate <*> genDeprecatedAfterMaryPParams <*> genShelleyToAlonzoPParams + <*> genDeprecatedAfterBabbagePParams genMaryEraBasedProtocolParametersUpdate :: MonadGen m => m (EraBasedProtocolParametersUpdate MaryEra) genMaryEraBasedProtocolParametersUpdate = @@ -94,6 +98,7 @@ genMaryEraBasedProtocolParametersUpdate = <$> genCommonProtocolParametersUpdate <*> genDeprecatedAfterMaryPParams <*> genShelleyToAlonzoPParams + <*> genDeprecatedAfterBabbagePParams genAlonzoEraBasedProtocolParametersUpdate :: MonadGen m => m (EraBasedProtocolParametersUpdate AlonzoEra) genAlonzoEraBasedProtocolParametersUpdate = @@ -101,12 +106,14 @@ genAlonzoEraBasedProtocolParametersUpdate = <$> genCommonProtocolParametersUpdate <*> genShelleyToAlonzoPParams <*> genAlonzoOnwardsPParams + <*> genDeprecatedAfterBabbagePParams genBabbageEraBasedProtocolParametersUpdate :: MonadGen m => m (EraBasedProtocolParametersUpdate BabbageEra) genBabbageEraBasedProtocolParametersUpdate = BabbageEraBasedProtocolParametersUpdate <$> genCommonProtocolParametersUpdate <*> genAlonzoOnwardsPParams + <*> genDeprecatedAfterBabbagePParams <*> genIntroducedInBabbagePParams genConwayEraBasedProtocolParametersUpdate :: MonadGen m => m (EraBasedProtocolParametersUpdate ConwayEra)