Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
storage-test: move TestBlock to testlib
  • Loading branch information
geo2a committed Jul 11, 2025
commit a77bd290ffabc22d38348e1339e3ea7890cc18ac
6 changes: 2 additions & 4 deletions ouroboros-consensus/ouroboros-consensus.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -453,6 +454,7 @@ library unstable-consensus-testlib
fs-api ^>=0.3,
fs-sim ^>=0.3,
generics-sop,
hashable,
io-classes,
io-sim,
mempack,
Expand Down Expand Up @@ -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
Expand All @@ -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},
Expand All @@ -753,7 +752,6 @@ test-suite storage-test
fs-api ^>=0.3,
fs-sim ^>=0.3,
generics-sop,
hashable,
io-classes,
io-sim,
mempack,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()
Expand Down Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down