Move utility functions to cardano-base

Author: neilmayhew

eras/mary/impl/cardano-ledger-mary.cabal

@@ -163,10 +163,11 @@ library testlib
   build-depends:
     base,
     bytestring,
+    cardano-base:testlib,
     cardano-crypto-class,
     cardano-data:testlib,
     cardano-ledger-allegra:testlib,
-    cardano-ledger-binary:{cardano-ledger-binary, testlib},
+    cardano-ledger-binary,
     cardano-ledger-core:{cardano-ledger-core, testlib},
     cardano-ledger-mary,
     cardano-ledger-shelley:{cardano-ledger-shelley, testlib},

eras/mary/impl/testlib/Test/Cardano/Ledger/Mary/Arbitrary.hs

@@ -40,9 +40,9 @@ import Data.Int (Int64)
 import qualified Data.Map.Strict as Map (empty)
 import Data.Maybe (fromMaybe)
 import Data.String (IsString (fromString))
+import Test.Cardano.Base.Bytes (genByteString, genShortByteString)
 import Test.Cardano.Data (genNonEmptyMap)
 import Test.Cardano.Ledger.Allegra.Arbitrary ()
-import Test.Cardano.Ledger.Binary.Arbitrary (genByteString, genShortByteString)
 import Test.Cardano.Ledger.Common
 
 instance Arbitrary AssetName where

eras/shelley/impl/cardano-ledger-shelley.cabal

@@ -215,6 +215,7 @@ library testlib
     ImpSpec,
     base,
     bytestring,
+    cardano-base:testlib,
     cardano-crypto,
     cardano-crypto-class,
     cardano-crypto-wrapper,

eras/shelley/impl/testlib/Test/Cardano/Ledger/Shelley/Imp/PoolSpec.hs

@@ -18,7 +18,7 @@ import Cardano.Ledger.State
 import Data.Map.Strict as Map
 import Data.Proxy
 import Lens.Micro
-import Test.Cardano.Ledger.Binary.Arbitrary (genByteArray)
+import Test.Cardano.Base.Bytes (genByteArray)
 import Test.Cardano.Ledger.Imp.Common
 import Test.Cardano.Ledger.Shelley.ImpTest
 

libs/cardano-ledger-binary/CHANGELOG.md

@@ -18,6 +18,8 @@
 
 ### `testlib`
 
+* Remove `genByteArray`, `genByteString`, `genLazyByteString`, `genShortByteString`.
+  These have been moved to `cardano-base:testlib`.
 * Remove `Arbitrary` instances for `CertifiedVRF`, `SigDSIGN`, `SignKeyDSIGN`, `SignedDSIGN`, `VerKeyDSIGN`.
   These have been moved to `cardano-crypto-class:testlib`.
 * Remove `Arbitrary` instances for `BlockNo`, `EpochInterval`, `EpochSize`, `SystemStart`, `WithOrigin`.

libs/cardano-ledger-binary/cardano-ledger-binary.cabal

@@ -114,6 +114,7 @@ library testlib
     base,
     base16-bytestring,
     bytestring,
+    cardano-base:testlib,
     cardano-binary,
     cardano-crypto-class:{cardano-crypto-class, testlib},
     cardano-crypto-praos:testlib,

libs/cardano-ledger-binary/testlib/Test/Cardano/Ledger/Binary/Arbitrary.hs

@@ -8,33 +8,22 @@
 
 module Test.Cardano.Ledger.Binary.Arbitrary (
   genVersion,
-  genByteArray,
-  genByteString,
-  genLazyByteString,
-  genShortByteString,
 ) where
 
 import Cardano.Ledger.Binary.Version
-import Codec.CBOR.ByteArray (ByteArray (..))
+import qualified Codec.CBOR.ByteArray as CBOR
 import Codec.CBOR.ByteArray.Sliced (SlicedByteArray (..))
 import Codec.CBOR.Term
-import qualified Data.ByteString as BS (ByteString, pack, unpack)
-import qualified Data.ByteString.Lazy as BSL (ByteString, fromChunks, fromStrict, toChunks)
-import Numeric.Half
-#if MIN_VERSION_bytestring(0,11,1)
-import qualified Data.ByteString.Short as SBS
-#else
-import qualified Data.ByteString.Short.Internal as SBS
-#endif
+import qualified Data.ByteString as BS
+import qualified Data.ByteString.Lazy as BSL
 import Data.IP (IPv4, IPv6, toIPv4w, toIPv6w)
-import qualified Data.Primitive.ByteArray as Prim (ByteArray (..))
 import qualified Data.Text as T
 import qualified Data.Text.Lazy as TL
 import qualified Data.VMap as VMap
 import Data.Word
 import GHC.Stack
-import System.Random.Stateful hiding (genByteString, genShortByteString)
-import Test.Cardano.Ledger.Binary.Random (QC (QC))
+import Numeric.Half
+import Test.Cardano.Base.Bytes (genByteArray, genByteString, genLazyByteString)
 import Test.Cardano.Slotting.Arbitrary ()
 import Test.Crypto.Hash ()
 import Test.Crypto.KES ()
@@ -115,7 +104,7 @@ genHalf = do
     then genHalf
     else pure $ fromHalf half
 
-deriving instance Arbitrary ByteArray
+deriving instance Arbitrary CBOR.ByteArray
 
 instance Arbitrary SlicedByteArray where
   arbitrary = do
@@ -153,22 +142,3 @@ genVersion minVersion maxVersion =
       case mkVersion32 v32 of
         Nothing -> error $ "Impossible: Invalid version generated: " ++ show v32
         Just v -> pure v
-
-genByteString :: Int -> Gen BS.ByteString
-genByteString n = uniformByteStringM (fromIntegral n) QC
-
-genLazyByteString :: Int -> Gen BSL.ByteString
-genLazyByteString n = BSL.fromStrict <$> genByteString n
-
-genShortByteString :: Int -> Gen SBS.ShortByteString
-#if MIN_VERSION_random(1,3,0)
-genShortByteString n = uniformShortByteStringM (fromIntegral n) QC
-#else
-genShortByteString n = uniformShortByteString (fromIntegral n) QC
-#endif
-
-genByteArray :: Int -> Gen Prim.ByteArray
-genByteArray n = do
-  sbs <- genShortByteString n
-  case sbs of
-    SBS.SBS ba -> pure (Prim.ByteArray ba)

libs/cardano-ledger-core/cardano-ledger-core.cabal

@@ -224,6 +224,7 @@ library testlib
     base16-bytestring,
     binary,
     bytestring,
+    cardano-base:testlib,
     cardano-crypto-class,
     cardano-crypto-wrapper:{cardano-crypto-wrapper, testlib},
     cardano-data:testlib,

libs/cardano-ledger-core/testlib/Test/Cardano/Ledger/Core/Arbitrary.hs

@@ -105,6 +105,7 @@ import Generic.Random (genericArbitraryU)
 import Numeric.Natural (Natural)
 import qualified PlutusLedgerApi.V1 as PV1
 import System.Random.Stateful (StatefulGen, uniformRM)
+import Test.Cardano.Base.Bytes (genByteString, genShortByteString)
 import qualified Test.Cardano.Chain.Common.Gen as Byron
 import Test.Cardano.Ledger.Binary.Arbitrary
 import Test.Cardano.Ledger.Core.Utils (unsafeBoundRational)

libs/cardano-ledger-test/cardano-ledger-test.cabal

@@ -78,6 +78,7 @@ library
     QuickCheck,
     base >=4.18 && <5,
     bytestring,
+    cardano-base:testlib,
     cardano-crypto,
     cardano-crypto-class ^>=2.3,
     cardano-crypto-wrapper,