storage-test: move TestBlock to testlib

Author: geo2a

ouroboros-consensus/ouroboros-consensus.cabal

@@ -383,6 +383,7 @@ library unstable-consensus-testlib
     Test.Ouroboros.Consensus.ChainGenerator.Some
     Test.Ouroboros.Consensus.DiffusionPipelining
     Test.Ouroboros.Consensus.Protocol
+    Test.Ouroboros.Storage.TestBlock
     Test.QuickCheck.Extras
     Test.Util.BoolProps
     Test.Util.ChainDB
@@ -453,6 +454,7 @@ library unstable-consensus-testlib
     fs-api ^>=0.3,
     fs-sim ^>=0.3,
     generics-sop,
+    hashable,
     io-classes,
     io-sim,
     mempack,
@@ -724,7 +726,6 @@ test-suite storage-test
     Test.Ouroboros.Storage.PerasCertDB
     Test.Ouroboros.Storage.PerasCertDB.Model
     Test.Ouroboros.Storage.PerasCertDB.StateMachine
-    Test.Ouroboros.Storage.TestBlock
     Test.Ouroboros.Storage.VolatileDB
     Test.Ouroboros.Storage.VolatileDB.Mock
     Test.Ouroboros.Storage.VolatileDB.Model
@@ -735,10 +736,8 @@ test-suite storage-test
     aeson,
     base,
     bifunctors,
-    binary,
     bytestring,
     cardano-binary,
-    cardano-crypto-class ^>=2.2,
     cardano-ledger-binary:testlib,
     cardano-ledger-core:{cardano-ledger-core, testlib},
     cardano-slotting:{cardano-slotting, testlib},
@@ -753,7 +752,6 @@ test-suite storage-test
     fs-api ^>=0.3,
     fs-sim ^>=0.3,
     generics-sop,
-    hashable,
     io-classes,
     io-sim,
     mempack,

ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/TestBlock.hs renamed to ouroboros-consensus/src/unstable-consensus-testlib/Test/Ouroboros/Storage/TestBlock.hs

@@ -125,7 +125,6 @@ import qualified Ouroboros.Network.Mock.Chain as Chain
 import System.FS.API.Lazy
 import Test.Cardano.Slotting.Numeric ()
 import Test.Cardano.Slotting.TreeDiff ()
-import Test.Ouroboros.Storage.ChainDB.Model
 import Test.QuickCheck
 import Test.Util.Orphans.Arbitrary ()
 import Test.Util.Orphans.SignableRepresentation ()
@@ -935,8 +934,6 @@ deriving instance ToExpr (HeaderEnvelopeError TestBlock)
 deriving instance ToExpr BftValidationErr
 deriving instance ToExpr (ExtValidationError TestBlock)
 
-instance ModelSupportsBlock TestBlock
-
 deriving anyclass instance ToExpr FsPath
 deriving anyclass instance ToExpr BlocksPerFile
 deriving instance ToExpr BinaryBlockInfo

ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/ChainDB/StateMachine.hs

@@ -345,6 +345,8 @@ deriving instance
   (TestConstraints blk, Show it, Show flr) =>
   Show (Success blk it flr)
 
+instance ModelSupportsBlock TestBlock
+
 -- | Short-hand
 type TestIterator m blk = WithEq (Iterator m blk (AllComponents blk))