Merge pull request #4956 from IntersectMBO/td/convert-byron-test-packages

Convert byron test packages to sublibraries

Author: teodanciu

RELEASING.md

@@ -334,8 +334,6 @@ but the changelog _only_ needs to indicate if breaking changes have been made:
 * `cardano-ledger-alonzo-test`
 * `cardano-ledger-babbage-test`
 * `cardano-ledger-conway-test`
-* `cardano-crypto-test`
-* `cardano-ledger-byron-test`
 
 A changelog which indicates that no changes have been made will have the form:
 

REVISIONING.md

@@ -72,9 +72,7 @@ Next, you will add the actual revisions and test if you can build your packages
    '.#"ghc96/byron-spec-chain/1.0.0.2"' \
    '.#"ghc96/byron-spec-ledger/1.0.0.2"' \
    '.#"ghc96/cardano-ledger-byron/1.0.0.4"' \
-   '.#"ghc96/cardano-ledger-byron-test/1.5.0.1"' \
    '.#"ghc96/cardano-crypto-wrapper/1.5.1.1"' \
-   '.#"ghc96/cardano-crypto-test/1.5.0.1"' \
    '.#"ghc96/cardano-ledger-conway/1.12.0.0"' \
    '.#"ghc96/cardano-ledger-conway-test/1.2.1.3"' \
    '.#"ghc96/cardano-ledger-mary/1.5.0.0"' \
@@ -120,9 +118,7 @@ Next, you will add the actual revisions and test if you can build your packages
    '.#"ghc96/byron-spec-chain/1.0.0.2"' \
    '.#"ghc96/byron-spec-ledger/1.0.0.2"' \
    '.#"ghc96/cardano-ledger-byron/1.0.0.4"' \
-   '.#"ghc96/cardano-ledger-byron-test/1.5.0.1"' \
    '.#"ghc96/cardano-crypto-wrapper/1.5.1.1"' \
-   '.#"ghc96/cardano-crypto-test/1.5.0.1"' \
    '.#"ghc96/cardano-ledger-conway/1.12.0.0"' \
    '.#"ghc96/cardano-ledger-conway-test/1.2.1.3"' \
    '.#"ghc96/cardano-ledger-mary/1.5.0.0"' \
@@ -169,9 +165,7 @@ extra-packages:
   byron-spec-chain-1.0.0.2,
   byron-spec-ledger-1.0.0.2,
   cardano-ledger-byron-1.0.0.4,
-  cardano-ledger-byron-test-1.5.0.1,
   cardano-crypto-wrapper-1.5.1.1,
-  cardano-crypto-test-1.5.0.1,
   cardano-ledger-conway-1.12.0.0,
   cardano-ledger-conway-test-1.2.1.3,
   cardano-ledger-mary-1.5.0.0,
@@ -211,9 +205,7 @@ library
    byron-spec-chain \
    byron-spec-ledger \
    cardano-ledger-byron \
-   cardano-ledger-byron-test \
    cardano-crypto-wrapper \
-   cardano-crypto-test \
    cardano-ledger-conway \
    cardano-ledger-conway-test \
    cardano-ledger-mary \
@@ -260,9 +252,7 @@ library
    byron-spec-chain \
    byron-spec-ledger \
    cardano-ledger-byron \
-   cardano-ledger-byron-test \
    cardano-crypto-wrapper \
-   cardano-crypto-test \
    cardano-ledger-conway \
    cardano-ledger-conway-test \
    cardano-ledger-mary \

cabal.project

@@ -29,9 +29,7 @@ packages:
   -- byron-spec-chain:
   -- byron-spec-ledger:
   -- cardano-ledger-byron:
-  -- cardano-ledger-byron-test:
   -- cardano-crypto-wrapper:
-  -- cardano-crypto-test:
   -- Packages used during development and are not released to CHaPs:
   eras/allegra/impl
   eras/alonzo/impl
@@ -56,9 +54,7 @@ packages:
   eras/byron/chain/executable-spec
   eras/byron/ledger/executable-spec
   eras/byron/ledger/impl
-  eras/byron/ledger/impl/test
   eras/byron/crypto
-  eras/byron/crypto/test
   libs/cardano-ledger-conformance
   libs/cardano-ledger-test
   libs/plutus-preprocessor

eras/byron/crypto/CHANGELOG.md

@@ -1,8 +1,10 @@
 # Revision history for `cardano-crypto-wrapper`
 
-## 1.6.0.1
+## 1.6.1.0
 
-*
+### `testlib`
+
+* Added `testlib` sublibrary as replacement of `cardano-crypto-test` package
 
 ## 1.6.0.0
 

eras/byron/crypto/cardano-crypto-wrapper.cabal

@@ -1,6 +1,6 @@
 cabal-version: 3.0
 name: cardano-crypto-wrapper
-version: 1.6.0.0
+version: 1.6.1.0
 license: Apache-2.0
 maintainer: [email protected]
 author: IOHK
@@ -13,24 +13,24 @@ description:
 category: Currency
 build-type: Simple
 data-files:
-  test/golden/AbstractHash
-  test/golden/DecShare
-  test/golden/EncShare
-  test/golden/PassPhrase
-  test/golden/RedeemSignature
-  test/golden/RedeemSigningKey
-  test/golden/RedeemVerificationKey
-  test/golden/Secret
-  test/golden/SecretProof
-  test/golden/Signature
-  test/golden/SigningKey
-  test/golden/VerificationKey
-  test/golden/VssPublicKey
-  test/golden/json/ProtocolMagic0_Legacy_HasNetworkMagic
-  test/golden/json/ProtocolMagic1_Legacy_HasNetworkMagic
-  test/golden/json/ProtocolMagic2_Legacy_HasNetworkMagic
-  test/golden/json/ProtocolMagic_Legacy_NMMustBeJust
-  test/golden/json/ProtocolMagic_Legacy_NMMustBeNothing
+  golden/AbstractHash
+  golden/DecShare
+  golden/EncShare
+  golden/PassPhrase
+  golden/RedeemSignature
+  golden/RedeemSigningKey
+  golden/RedeemVerificationKey
+  golden/Secret
+  golden/SecretProof
+  golden/Signature
+  golden/SigningKey
+  golden/VerificationKey
+  golden/VssPublicKey
+  golden/json/ProtocolMagic0_Legacy_HasNetworkMagic
+  golden/json/ProtocolMagic1_Legacy_HasNetworkMagic
+  golden/json/ProtocolMagic2_Legacy_HasNetworkMagic
+  golden/json/ProtocolMagic_Legacy_NMMustBeJust
+  golden/json/ProtocolMagic_Legacy_NMMustBeNothing
 
 extra-source-files:
   CHANGELOG.md
@@ -98,22 +98,54 @@ library
     nothunks,
     text,
 
+library testlib
+  exposed-modules:
+    Test.Cardano.Crypto.CBOR
+    Test.Cardano.Crypto.Dummy
+    Test.Cardano.Crypto.Example
+    Test.Cardano.Crypto.Gen
+    Test.Cardano.Crypto.Json
+    Test.Cardano.Crypto.Orphans
+
+  visibility: public
+  hs-source-dirs: testlib
+  other-modules:
+    Paths_cardano_crypto_wrapper
+
+  default-language: Haskell2010
+  default-extensions: NoImplicitPrelude
+  ghc-options:
+    -Weverything
+    -Wno-all-missed-specialisations
+    -Wno-missing-deriving-strategies
+    -Wno-missing-import-lists
+    -Wno-missing-safe-haskell-mode
+    -Wno-prepositive-qualified-module
+    -Wno-safe
+    -Wno-unsafe
+    -Wunused-packages
+
+  build-depends:
+    base,
+    bytestring,
+    cardano-crypto,
+    cardano-crypto-wrapper,
+    cardano-ledger-binary:{cardano-ledger-binary, testlib},
+    cardano-prelude,
+    cardano-prelude-test,
+    crypton,
+    hedgehog >=1.0.4,
+    memory,
+
 test-suite test
   type: exitcode-stdio-1.0
   main-is: test.hs
   hs-source-dirs: test
   other-modules:
-    GetDataFileName
     Paths_cardano_crypto_wrapper
-    Test.Cardano.Crypto.CBOR
-    Test.Cardano.Crypto.Dummy
-    Test.Cardano.Crypto.Example
-    Test.Cardano.Crypto.Gen
     Test.Cardano.Crypto.Hashing
-    Test.Cardano.Crypto.Json
     Test.Cardano.Crypto.Keys
     Test.Cardano.Crypto.Limits
-    Test.Cardano.Crypto.Orphans
     Test.Cardano.Crypto.Random
     Test.Cardano.Crypto.Signing.Redeem
     Test.Cardano.Crypto.Signing.Redeem.Compact
@@ -140,11 +172,10 @@ test-suite test
     bytestring,
     cardano-crypto,
     cardano-crypto-wrapper,
-    cardano-ledger-binary:{cardano-ledger-binary, testlib},
+    cardano-ledger-binary,
     cardano-prelude,
     cardano-prelude-test,
     crypton,
-    filepath,
     formatting,
     hedgehog >=1.0.4,
-    memory,
+    testlib,

eras/byron/crypto/test/golden/AbstractHash renamed to eras/byron/crypto/golden/AbstractHash

@@ -44,8 +44,8 @@ prop_hashInequalityUnitList =
 
 prop_hashInequalityListOfList :: Property
 prop_hashInequalityListOfList =
-  hashInequality $
-    Gen.list
+  hashInequality
+    $ Gen.list
       (Range.constant 0 10)
       (Gen.list (Range.constant 0 20) (Gen.maybe $ Gen.int Range.constantBounded))
 
@@ -55,7 +55,7 @@ prop_goldenHash =
   withTests 1
     . property
     $ sformat hashHexF (serializeCborHash (1 :: Word64))
-      === "ee155ace9c40292074cb6aff8c9ccdd273c81648ff1149ef36bcea6ebb8a3e25"
+    === "ee155ace9c40292074cb6aff8c9ccdd273c81648ff1149ef36bcea6ebb8a3e25"
 
 -- | Check that 'decodeAbstractHash' correctly decodes hash values
 prop_decodeAbstractHash :: Property

eras/byron/crypto/test/golden/DecShare renamed to eras/byron/crypto/golden/DecShare

@@ -46,9 +46,9 @@ prop_redeemSign = property $ do
   (vk, sk) <- forAll genRedeemKeypair
   a <- forAll genData
 
-  assert $
-    verifyRedeemSig Dummy.protocolMagicId SignForTestingOnly vk a $
-      redeemSign Dummy.protocolMagicId SignForTestingOnly sk a
+  assert
+    $ verifyRedeemSig Dummy.protocolMagicId SignForTestingOnly vk a
+    $ redeemSign Dummy.protocolMagicId SignForTestingOnly sk a
 
 -- | Signing fails when the wrong 'RedeemVerificationKey' is used
 prop_redeemSignDifferentKey :: Property

eras/byron/crypto/test/golden/EncShare renamed to eras/byron/crypto/golden/EncShare

@@ -40,9 +40,9 @@ prop_sign = property $ do
   (vk, sk) <- forAll genKeypair
   a <- forAll genData
 
-  assert $
-    verifySignature encCBOR Dummy.protocolMagicId SignForTestingOnly vk a $
-      sign Dummy.protocolMagicId SignForTestingOnly sk a
+  assert
+    $ verifySignature encCBOR Dummy.protocolMagicId SignForTestingOnly vk a
+    $ sign Dummy.protocolMagicId SignForTestingOnly sk a
 
 -- | Signing fails when the wrong 'VerificationKey' is used
 prop_signDifferentKey :: Property