Skip to content

Commit 13deb19

Browse files
committed
Export AnyScript from Cardano.Api.Experimental
1 parent 99a7894 commit 13deb19

4 files changed

Lines changed: 15 additions & 3 deletions

File tree

cardano-api/src/Cardano/Api/Experimental.hs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ module Cardano.Api.Experimental
5050
, Witnessable (..)
5151
, WitnessableItem (..)
5252

53+
-- ** AnyScript related
54+
, AnyScript (..)
55+
, deserialiseAnyPlutusScriptOfLanguage
56+
, deserialiseAnySimpleScript
57+
, hashAnyScript
58+
5359
-- ** Simple script related
5460
, SimpleScript (..)
5561
, SimpleScriptOrReferenceInput (..)
@@ -98,6 +104,7 @@ module Cardano.Api.Experimental
98104
)
99105
where
100106

107+
import Cardano.Api.Experimental.AnyScript
101108
import Cardano.Api.Experimental.Certificate
102109
import Cardano.Api.Experimental.Era
103110
import Cardano.Api.Experimental.Plutus.Internal.IndexedPlutusScriptWitness

cardano-api/src/Cardano/Api/Experimental/AnyScript.hs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ instance L.Era era => HasTypeProxy (AnyScript era) where
4242
data AsType (AnyScript era) = AsAnyScript
4343
proxyToAsType _ = AsAnyScript
4444

45+
instance Show (AnyScript era) where
46+
show (AnySimpleScript ss) = "AnySimpleScript " ++ show ss
47+
show (AnyPlutusScript ps) = "AnyPlutusScript " ++ show ps
48+
4549
instance Eq (AnyScript era) where
4650
AnySimpleScript s1 == AnySimpleScript s2 = s1 == s2
4751
AnyPlutusScript (ps1 :: PlutusScriptInEra lang1 era) == AnyPlutusScript (ps2 :: PlutusScriptInEra lang2 era) =

cardano-api/test/cardano-api-test/Test/Cardano/Api/Experimental.hs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,15 @@ tests =
122122
prop_roundtrip_cbor_any_script :: Property
123123
prop_roundtrip_cbor_any_script = H.property $ do
124124
script <- H.forAll genAnyScript
125-
H.tripping script Exp.serialiseToCBOR (Exp.deserialiseFromCBOR Exp.AsAnyScript)
125+
H.tripping script Api.serialiseToCBOR (Api.deserialiseFromCBOR Exp.AsAnyScript)
126126

127127
-- | Deserialising random garbage bytes should always return 'Left'.
128128
prop_deserialise_garbage_bytes_returns_left :: Property
129129
prop_deserialise_garbage_bytes_returns_left = H.property $ do
130130
garbage <- H.forAll $ Gen.bytes (Range.linear 0 128)
131-
case Exp.deserialiseFromCBOR Exp.AsAnyScript garbage of
131+
case Api.deserialiseFromCBOR
132+
(Exp.AsAnyScript :: Exp.AsType (Exp.AnyScript (Exp.LedgerEra Exp.ConwayEra)))
133+
garbage of
132134
Left _ -> H.success
133135
Right _ -> H.annotate "Expected deserialisation failure but got Right" >> H.failure
134136

cardano-api/test/cardano-api-test/Test/Cardano/Api/Transaction/Body/Plutus/Scripts.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ where
1111
import Cardano.Api (AlonzoEraOnwards (..))
1212
import Cardano.Api qualified as Api
1313
import Cardano.Api.Experimental
14-
import Cardano.Api.Experimental.AnyScript
1514
import Cardano.Api.Experimental.AnyScriptWitness
1615
import Cardano.Api.Experimental.Plutus hiding (AnyPlutusScript (..))
1716
import Cardano.Api.Experimental.Tx qualified as Exp

0 commit comments

Comments
 (0)