Merge branch 'master' into master

IntersectMBO · Mar 8, 2024 · 2dea3bd · 2dea3bd
2 parents f99aee2 + a13e552
commit 2dea3bd
Show file tree

Hide file tree

Showing 85 changed files with 374 additions and 331 deletions.
diff --git a/cabal.project b/cabal.project
@@ -40,7 +40,6 @@ packages:
   libs/cardano-protocol-tpraos
   libs/non-integral
   libs/small-steps
-  libs/small-steps-test
   libs/cardano-data
   libs/set-algebra
   libs/vector-map

diff --git a/eras/alonzo/test-suite/CHANGELOG.md b/eras/alonzo/test-suite/CHANGELOG.md
@@ -1,8 +1,8 @@
 # Version history for `cardano-ledger-alonzo-test`
 
-## 1.2.0.1
+## 1.2.1.0
 
-*
+* Replaced `small-steps-test` dependency with `small-steps:testlib`
 
 ## 1.2.0.0
 

diff --git a/eras/alonzo/test-suite/cardano-ledger-alonzo-test.cabal b/eras/alonzo/test-suite/cardano-ledger-alonzo-test.cabal
@@ -1,6 +1,6 @@
 cabal-version: 3.0
 name:          cardano-ledger-alonzo-test
-version:       1.2.0.1
+version:       1.2.1.0
 license:       Apache-2.0
 maintainer:    operations@iohk.io
 author:        IOHK
@@ -63,8 +63,7 @@ library
         QuickCheck,
         random,
         serialise,
-        small-steps >=1.1,
-        small-steps-test >=1.1,
+        small-steps:{small-steps, testlib} >=1.1,
         tasty-hunit,
         time,
         transformers
@@ -122,8 +121,7 @@ test-suite cardano-ledger-alonzo-test
         data-default-class,
         plutus-ledger-api,
         QuickCheck,
-        small-steps >=1.1,
-        small-steps-test >=1.1,
+        small-steps:{small-steps, testlib} >=1.1,
         cardano-ledger-shelley:{cardano-ledger-shelley, testlib},
         cardano-ledger-shelley-test,
         microlens,

diff --git a/eras/alonzo/test-suite/src/Test/Cardano/Ledger/Alonzo/Trace.hs b/eras/alonzo/test-suite/src/Test/Cardano/Ledger/Alonzo/Trace.hs
@@ -30,7 +30,6 @@ import Cardano.Ledger.UTxO (EraUTxO)
 import Cardano.Slotting.Slot (SlotNo (..))
 import Control.Monad.Trans.Reader (runReaderT)
 import Control.State.Transition
-import qualified Control.State.Transition.Trace.Generator.QuickCheck as TQC
 import Data.Functor.Identity (runIdentity)
 import Data.Sequence (Seq)
 import Test.Cardano.Ledger.Alonzo.AlonzoEraGen ()
@@ -41,6 +40,7 @@ import Test.Cardano.Ledger.Shelley.Generator.ShelleyEraGen ()
 import Test.Cardano.Ledger.Shelley.Generator.Trace.Ledger (genAccountState)
 import Test.Cardano.Ledger.Shelley.Generator.Trace.TxCert (CERTS)
 import Test.Cardano.Ledger.Shelley.Generator.Utxo (genTx)
+import qualified Test.Control.State.Transition.Trace.Generator.QuickCheck as TQC
 
 -- The AlonzoLEDGER STS combines utxo and delegation rules and allows for generating transactions
 -- with meaningful delegation certificates.

diff --git a/eras/alonzo/test-suite/test/Test/Cardano/Ledger/Alonzo/ChainTrace.hs b/eras/alonzo/test-suite/test/Test/Cardano/Ledger/Alonzo/ChainTrace.hs
@@ -31,7 +31,6 @@ import Cardano.Ledger.UTxO (UTxO (..))
 import Cardano.Slotting.EpochInfo (fixedEpochInfo)
 import Cardano.Slotting.Time (SystemStart (..), mkSlotLength)
 import Control.State.Transition
-import Control.State.Transition.Trace (SourceSignalTarget (..), sourceSignalTargets)
 import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
 import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
@@ -53,6 +52,7 @@ import Test.Cardano.Ledger.Shelley.Rules.TestChain (
   forAllChainTrace,
   ledgerTraceFromBlock,
  )
+import Test.Control.State.Transition.Trace (SourceSignalTarget (..), sourceSignalTargets)
 import Test.QuickCheck (
   Property,
   conjoin,

diff --git a/eras/byron/chain/executable-spec/CHANGELOG.md b/eras/byron/chain/executable-spec/CHANGELOG.md
@@ -1,8 +1,8 @@
 # Version history for `byron-spec-chain`
 
-## 1.0.0.3
+## 1.0.1.0
 
-*
+* Replaced `small-steps-test` dependency with `small-steps:testlib`
 
 ## 1.0.0.2
 

diff --git a/eras/byron/chain/executable-spec/byron-spec-chain.cabal b/eras/byron/chain/executable-spec/byron-spec-chain.cabal
@@ -1,6 +1,6 @@
 cabal-version:      3.0
 name:               byron-spec-chain
-version:            1.0.0.2
+version:            1.0.1.0
 license:            Apache-2.0
 maintainer:         operations@iohk.io
 author:             IOHK
@@ -36,8 +36,7 @@ library
         hedgehog >=1.0.4,
         microlens,
         microlens-th,
-        small-steps >=1.1,
-        small-steps-test >=1.1
+        small-steps:{small-steps, testlib} >=1.1
 
 test-suite chain-rules-test
     type:             exitcode-stdio-1.0
@@ -64,5 +63,4 @@ test-suite chain-rules-test
         tasty-hunit,
         byron-spec-chain,
         byron-spec-ledger,
-        small-steps >=1.1,
-        small-steps-test >=1.1
+        small-steps:{small-steps, testlib} >=1.1
diff --git a/eras/byron/chain/executable-spec/src/Byron/Spec/Chain/STS/Block.hs b/eras/byron/chain/executable-spec/src/Byron/Spec/Chain/STS/Block.hs
@@ -13,7 +13,6 @@ import Byron.Spec.Ledger.Core (Hash (Hash), Sig (Sig), Slot, VKey, hash, owner)
 import Byron.Spec.Ledger.Delegation
 import Byron.Spec.Ledger.UTxO (Tx, TxIn, TxOut, Wit)
 import Byron.Spec.Ledger.Update (ProtVer, STag, UProp, Vote)
-import Control.State.Transition.Generator
 import Data.AbstractSize
 import Data.ByteString (ByteString)
 import Data.Data (Data, Typeable)
@@ -27,6 +26,7 @@ import Lens.Micro ((^.))
 import Lens.Micro.Extras (view)
 import Lens.Micro.TH (makeLenses)
 import Numeric.Natural (Natural)
+import Test.Control.State.Transition.Generator
 
 data BlockHeader = BlockHeader
   { _bhPrevHash :: !Hash

diff --git a/eras/byron/chain/executable-spec/src/Byron/Spec/Chain/STS/Rule/Chain.hs b/eras/byron/chain/executable-spec/src/Byron/Spec/Chain/STS/Rule/Chain.hs
@@ -28,7 +28,6 @@ import Byron.Spec.Ledger.UTxO (UTxO, mapUTxOValues)
 import Byron.Spec.Ledger.Update hiding (delegationMap)
 import qualified Byron.Spec.Ledger.Update as Update
 import Control.State.Transition
-import Control.State.Transition.Generator
 import Data.Bimap (Bimap)
 import Data.Bits (shift)
 import Data.Data (Data, Typeable)
@@ -45,6 +44,7 @@ import qualified Hedgehog.Range as Range
 import Lens.Micro (Lens', (^.))
 import Lens.Micro.Internal (Field1 (..), Field5 (..))
 import Numeric.Natural (Natural)
+import Test.Control.State.Transition.Generator
 
 data CHAIN deriving (Data, Typeable)
 

diff --git a/eras/byron/chain/executable-spec/test/Test/Byron/AbstractSize/Properties.hs b/eras/byron/chain/executable-spec/test/Test/Byron/AbstractSize/Properties.hs
@@ -10,8 +10,6 @@ import Byron.Spec.Ledger.Core hiding ((<|))
 import Byron.Spec.Ledger.Delegation (DCert)
 import Byron.Spec.Ledger.UTxO
 import Byron.Spec.Ledger.Update (ProtVer (..), UProp (..), Vote)
-import Control.State.Transition.Generator (trace)
-import Control.State.Transition.Trace (TraceOrder (OldestFirst), traceSignals)
 import Data.AbstractSize
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
@@ -24,6 +22,8 @@ import Data.Word (Word64)
 import Hedgehog (MonadTest, Property, diff, forAll, property, withTests, (===))
 import Hedgehog.Internal.Property (PropertyName (..))
 import Numeric.Natural (Natural)
+import Test.Control.State.Transition.Generator (trace)
+import Test.Control.State.Transition.Trace (TraceOrder (OldestFirst), traceSignals)
 import Test.Tasty (TestName, TestTree, testGroup)
 import Test.Tasty.HUnit (Assertion, testCase, (@?=))
 import Test.Tasty.Hedgehog hiding (testProperty)

diff --git a/eras/byron/chain/executable-spec/test/Test/Byron/Spec/Chain/STS/Properties.hs b/eras/byron/chain/executable-spec/test/Test/Byron/Spec/Chain/STS/Properties.hs
@@ -12,13 +12,6 @@ import Byron.Spec.Ledger.Delegation
 import Byron.Spec.Ledger.GlobalParams (slotsPerEpoch)
 import Control.Arrow ((***))
 import Control.State.Transition
-import Control.State.Transition.Generator (
-  TraceLength (Desired, Maximum),
-  classifyTraceLength,
-  traceSigGen,
- )
-import qualified Control.State.Transition.Generator as Transition.Generator
-import Control.State.Transition.Trace
 import Data.Foldable (traverse_)
 import Data.List.Ordered (nubSortBy)
 import Data.Ord (Down (Down), comparing)
@@ -35,6 +28,13 @@ import Hedgehog (
  )
 import Lens.Micro ((&), (^.), (^..), _1, _5)
 import Lens.Micro.Extras (view)
+import Test.Control.State.Transition.Generator (
+  TraceLength (Desired, Maximum),
+  classifyTraceLength,
+  traceSigGen,
+ )
+import qualified Test.Control.State.Transition.Generator as Transition.Generator
+import Test.Control.State.Transition.Trace
 
 slotsIncrease :: Property
 slotsIncrease = property $ do

diff --git a/eras/byron/ledger/executable-spec/CHANGELOG.md b/eras/byron/ledger/executable-spec/CHANGELOG.md
@@ -1,8 +1,8 @@
 # Version history for `byron-spec-ledger`
 
-## 1.0.0.3
+## 1.0.1.0
 
-*
+* Replaced `small-steps-test` dependency with `small-steps:testlib`
 
 ## 1.0.0.2
 

diff --git a/eras/byron/ledger/executable-spec/byron-spec-ledger.cabal b/eras/byron/ledger/executable-spec/byron-spec-ledger.cabal
@@ -1,6 +1,6 @@
 cabal-version:      3.0
 name:               byron-spec-ledger
-version:            1.0.0.2
+version:            1.0.1.0
 license:            Apache-2.0
 maintainer:         operations@iohk.io
 author:             IOHK
@@ -48,8 +48,7 @@ library
         microlens,
         microlens-th,
         nothunks,
-        small-steps >=1.1,
-        small-steps-test >=1.1,
+        small-steps:{small-steps, testlib} >=1.1,
         Unique >=0.4.7.6
 
 test-suite byron-spec-ledger-test
@@ -84,5 +83,4 @@ test-suite byron-spec-ledger-test
         tasty-hedgehog,
         Unique,
         byron-spec-ledger,
-        small-steps >=1.1,
-        small-steps-test >=1.1
+        small-steps:{small-steps, testlib} >=1.1
diff --git a/eras/byron/ledger/executable-spec/src/Byron/Spec/Ledger/Delegation.hs b/eras/byron/ledger/executable-spec/src/Byron/Spec/Ledger/Delegation.hs
@@ -140,13 +140,6 @@ import Control.State.Transition (
   wrapFailed,
   (?!),
  )
-import Control.State.Transition.Generator (
-  HasTrace,
-  envGen,
-  genTrace,
-  sigGen,
- )
-import Control.State.Transition.Trace (TraceOrder (OldestFirst), traceSignals)
 import Data.AbstractSize
 import Data.Bimap (Bimap, (!>))
 import qualified Data.Bimap as Bimap
@@ -168,6 +161,13 @@ import qualified Hedgehog.Range as Range
 import Lens.Micro (Lens', lens, to, (%~), (&), (.~), (<>~), (^.), _1)
 import Lens.Micro.TH (makeFields)
 import NoThunks.Class (NoThunks (..), allNoThunks, noThunksInKeysAndValues)
+import Test.Control.State.Transition.Generator (
+  HasTrace,
+  envGen,
+  genTrace,
+  sigGen,
+ )
+import Test.Control.State.Transition.Trace (TraceOrder (OldestFirst), traceSignals)
 
 --------------------------------------------------------------------------------
 -- Abstract types

diff --git a/eras/byron/ledger/executable-spec/src/Byron/Spec/Ledger/Delegation/Test.hs b/eras/byron/ledger/executable-spec/src/Byron/Spec/Ledger/Delegation/Test.hs
@@ -5,11 +5,11 @@
 module Byron.Spec.Ledger.Delegation.Test (coverDelegFailures) where
 
 import Byron.Spec.Ledger.Delegation
-import qualified Control.State.Transition.Generator as Generator
 import Data.Data (Data)
 import GHC.Stack (HasCallStack)
 import Hedgehog (MonadTest)
 import Hedgehog.Internal.Property (CoverPercentage)
+import qualified Test.Control.State.Transition.Generator as Generator
 
 coverDelegFailures ::
   forall m a.

diff --git a/eras/byron/ledger/executable-spec/src/Byron/Spec/Ledger/STS/UTXOW.hs b/eras/byron/ledger/executable-spec/src/Byron/Spec/Ledger/STS/UTXOW.hs
@@ -43,19 +43,19 @@ import Control.State.Transition (
   wrapFailed,
   (?!),
  )
-import Control.State.Transition.Generator (
-  HasTrace,
-  coverFailures,
-  envGen,
-  sigGen,
- )
 import Data.Data (Data, Typeable)
 import qualified Data.Map as Map
 import GHC.Generics (Generic)
 import GHC.Stack (HasCallStack)
 import Hedgehog (MonadTest)
 import Hedgehog.Internal.Property (CoverPercentage)
 import NoThunks.Class (NoThunks (..))
+import Test.Control.State.Transition.Generator (
+  HasTrace,
+  coverFailures,
+  envGen,
+  sigGen,
+ )
 
 data UTXOW deriving (Data, Typeable)
 

diff --git a/eras/byron/ledger/executable-spec/src/Byron/Spec/Ledger/STS/UTXOWS.hs b/eras/byron/ledger/executable-spec/src/Byron/Spec/Ledger/STS/UTXOWS.hs
@@ -30,11 +30,11 @@ import Control.State.Transition (
   transitionRules,
   wrapFailed,
  )
-import Control.State.Transition.Generator (HasTrace, envGen, genTrace, sigGen)
-import Control.State.Transition.Trace (TraceOrder (OldestFirst), traceSignals)
 import Data.Data (Data, Typeable)
 import GHC.Generics (Generic)
 import NoThunks.Class (NoThunks (..))
+import Test.Control.State.Transition.Generator (HasTrace, envGen, genTrace, sigGen)
+import Test.Control.State.Transition.Trace (TraceOrder (OldestFirst), traceSignals)
 
 data UTXOWS deriving (Data, Typeable)
 

diff --git a/eras/byron/ledger/executable-spec/src/Byron/Spec/Ledger/Update.hs b/eras/byron/ledger/executable-spec/src/Byron/Spec/Ledger/Update.hs
@@ -52,11 +52,6 @@ import Byron.Spec.Ledger.Core.Omniscient (skey)
 import qualified Byron.Spec.Ledger.GlobalParams as GP
 import Control.Arrow (second, (&&&))
 import Control.State.Transition
-import Control.State.Transition.Generator (
-  HasTrace,
-  envGen,
-  sigGen,
- )
 import Data.AbstractSize (HasTypeReps)
 import Data.Bimap (Bimap, empty, lookupR)
 import qualified Data.Bimap as Bimap
@@ -85,6 +80,11 @@ import Lens.Micro.Internal (Field1 (..), Field2 (..), Field3 (..))
 import Lens.Micro.TH (makeLenses)
 import NoThunks.Class (NoThunks (..))
 import Numeric.Natural
+import Test.Control.State.Transition.Generator (
+  HasTrace,
+  envGen,
+  sigGen,
+ )
 import Prelude
 
 newtype FactorA = FactorA Int

diff --git a/eras/byron/ledger/executable-spec/src/Byron/Spec/Ledger/Update/Test.hs b/eras/byron/ledger/executable-spec/src/Byron/Spec/Ledger/Update/Test.hs
@@ -9,11 +9,11 @@ module Byron.Spec.Ledger.Update.Test (
 where
 
 import Byron.Spec.Ledger.Update
-import qualified Control.State.Transition.Generator as Generator
 import Data.Data (Data)
 import GHC.Stack (HasCallStack)
 import Hedgehog (MonadTest)
 import Hedgehog.Internal.Property (CoverPercentage)
+import qualified Test.Control.State.Transition.Generator as Generator
 
 -- | Check that all the relevant predicate failures are covered.
 coverUpiregFailures ::

diff --git a/eras/byron/ledger/executable-spec/test/Test/Byron/Spec/Ledger/AbstractSize/Properties.hs b/eras/byron/ledger/executable-spec/test/Test/Byron/Spec/Ledger/AbstractSize/Properties.hs
@@ -7,8 +7,6 @@ module Test.Byron.Spec.Ledger.AbstractSize.Properties (testTxHasTypeReps, testPr
 import Byron.Spec.Ledger.Core hiding ((<|))
 import Byron.Spec.Ledger.STS.UTXOW (UTXOW)
 import Byron.Spec.Ledger.UTxO
-import Control.State.Transition.Generator (trace)
-import Control.State.Transition.Trace (TraceOrder (OldestFirst), traceSignals)
 import Data.AbstractSize
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
@@ -18,6 +16,8 @@ import Data.Typeable (TypeRep, Typeable, typeOf)
 import Hedgehog (MonadTest, Property, forAll, property, withTests, (===))
 import Hedgehog.Internal.Property (PropertyName (..))
 import Numeric.Natural (Natural)
+import Test.Control.State.Transition.Generator (trace)
+import Test.Control.State.Transition.Trace (TraceOrder (OldestFirst), traceSignals)
 import Test.Tasty (TestName, TestTree, testGroup)
 import Test.Tasty.HUnit (Assertion, testCase, (@?=))
 import Test.Tasty.Hedgehog hiding (testProperty)

diff --git a/eras/byron/ledger/executable-spec/test/Test/Byron/Spec/Ledger/Delegation/Examples.hs b/eras/byron/ledger/executable-spec/test/Test/Byron/Spec/Ledger/Delegation/Examples.hs
@@ -36,11 +36,11 @@ import Byron.Spec.Ledger.Delegation (
   _dSEnvK,
   _dSEnvSlot,
  )
-import Control.State.Transition.Trace (checkTrace, (.-), (.->))
 import Data.Functor.Identity (runIdentity)
 import Data.Set (Set, fromList)
 import Data.Word (Word64)
 import Numeric.Natural (Natural)
+import Test.Control.State.Transition.Trace (checkTrace, (.-), (.->))
 import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.HUnit (testCase)