Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve the propagation of explanations when a Spec fails. #4739

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+430 −193
Open

Improve the propagation of explanations when a Spec fails. #4739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion eras/byron/chain/executable-spec/byron-spec-chain.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,5 @@ test-suite chain-rules-test
tasty-hedgehog,
tasty-hunit,
byron-spec-chain,
byron-spec-ledger,
byron-spec-ledger >=1.0,
small-steps:{small-steps, testlib} >=1.1
3 changes: 3 additions & 0 deletions libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Conway/Instances/Ledger.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1687,6 +1687,7 @@ instance CoercibleLike (CompactForm Coin) Word64 where
, reify x' unCompactCoin (==. V x)
]
coerceSpec TrueSpec = TrueSpec
coerceSpec (ExplainSpec es x) = ExplainSpec es (coerceSpec x)

getCoerceSpec ::
forall (fn :: [Type] -> Type -> Type).
Expand Down Expand Up @@ -1762,6 +1763,8 @@ toDelta_ ::
toDelta_ = app toDeltaFn

instance (Typeable fn, Member (CoinFn fn) fn) => Functions (CoinFn fn) fn where
propagateSpecFun fn ctx (ExplainSpec [] s) = propagateSpecFun fn ctx s
propagateSpecFun fn ctx (ExplainSpec es s) = ExplainSpec es $ propagateSpecFun fn ctx s
propagateSpecFun _ _ TrueSpec = TrueSpec
propagateSpecFun _ _ (ErrorSpec err) = ErrorSpec err
propagateSpecFun fn (ListCtx pre HOLE suf) (SuspendedSpec x p) =
Expand Down
2 changes: 1 addition & 1 deletion libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Conway/LedgerTypes/Specs.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ import Cardano.Ledger.UMap (CompactForm (..))
import qualified Cardano.Ledger.UMap as UMap
import Cardano.Ledger.UTxO (UTxO (..))
import Constrained hiding (Value)
import Constrained.Base (Pred (..), hasSize, rangeSize)
import Constrained.Base (Pred (..))
import Data.Map (Map)
import qualified Data.Map as Map
import Data.Set (Set)
Expand Down
1 change: 0 additions & 1 deletion libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Conway/LedgerTypes/Tests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import Cardano.Ledger.Shelley.LedgerState (
)
import Cardano.Ledger.UTxO (UTxO (..))
import Constrained hiding (Value)
import Constrained.Base (hasSize, rangeSize)
import Data.Kind (Type)
import Data.Map (Map)
import qualified Data.Set as Set
Expand Down
1 change: 0 additions & 1 deletion .../cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Conway/LedgerTypes/WellFormed.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import Cardano.Ledger.SafeHash ()
import Cardano.Ledger.Shelley.LedgerState
import Cardano.Ledger.UTxO (UTxO (..))
import Constrained hiding (Value)
import Constrained.Base (hasSize, rangeSize)
import Data.Map (Map)
import Test.Cardano.Ledger.Constrained.Conway ()
import Test.Cardano.Ledger.Constrained.Conway.Instances
Expand Down
3 changes: 3 additions & 0 deletions libs/constrained-generators/src/Constrained.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ module Constrained (
MapSpec (..),
FoldSpec (..),
simplifySpec,
addToErrorSpec,
genFromSpecT,
genFromSpec,
genFromSpecWithSeed,
Expand Down Expand Up @@ -117,6 +118,8 @@ module Constrained (
cNothing_,
cJust_,
null_,
rangeSize,
hasSize,
injectFn,
app,
lit,
Expand Down
Loading
Loading