Merge pull request #4763 from input-output-hk/jordan/remove-simple-sc…

…ript-distinction Remove simple script distinction
IntersectMBO · Mar 8, 2023 · 52c8ed6 · 52c8ed6
2 parents 751f22b + 776a29e
commit 52c8ed6
Show file tree

Hide file tree

Showing 10 changed files with 215 additions and 419 deletions.
diff --git a/cardano-api/ChangeLog.md b/cardano-api/ChangeLog.md
@@ -26,6 +26,8 @@
 
 - **Breaking change** - `queryExpr` to return `IO (Either UnsupportedNtcVersionError a)` instead of `IO a`.
   ([PR4788](https://github.com/input-output-hk/cardano-node/pull/4788))
+
+- **Breaking change** - Remove distinction between multisig and timelock scripts([PR4763](https://github.com/input-output-hk/cardano-node/pull/4763))
 
 ### Bugs
 

diff --git a/cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs b/cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs
@@ -125,7 +125,6 @@ import qualified Data.ByteString.Short as SBS
 import           Data.Coerce
 import           Data.Int (Int64)
 import           Data.Map.Strict (Map)
-import           Data.Maybe (maybeToList)
 import           Data.Ratio (Ratio, (%))
 import           Data.String
 import           Data.Word (Word64)
@@ -185,27 +184,23 @@ genLovelace = Lovelace <$> Gen.integral (Range.linear 0 5000)
 --
 
 genScript :: ScriptLanguage lang -> Gen (Script lang)
-genScript (SimpleScriptLanguage lang) =
-    SimpleScript lang <$> genSimpleScript lang
+genScript SimpleScriptLanguage =
+    SimpleScript <$> genSimpleScript
 genScript (PlutusScriptLanguage lang) =
     PlutusScript lang <$> genPlutusScript lang
 
-genSimpleScript :: SimpleScriptVersion lang -> Gen (SimpleScript lang)
-genSimpleScript lang =
+genSimpleScript :: Gen SimpleScript
+genSimpleScript =
     genTerm
   where
     genTerm = Gen.recursive Gen.choice nonRecursive recursive
 
     -- Non-recursive generators
     nonRecursive =
-         (RequireSignature . verificationKeyHash <$>
-             genVerificationKey AsPaymentKey)
-
-      : [ RequireTimeBefore supported <$> genSlotNo
-        | supported <- maybeToList (timeLocksSupported lang) ]
-
-     ++ [ RequireTimeAfter supported <$> genSlotNo
-        | supported <- maybeToList (timeLocksSupported lang) ]
+      [ RequireSignature . verificationKeyHash <$> genVerificationKey AsPaymentKey
+      , RequireTimeBefore <$> genSlotNo
+      , RequireTimeAfter <$> genSlotNo
+      ]
 
     -- Recursive generators
     recursive =

diff --git a/cardano-api/src/Cardano/Api.hs b/cardano-api/src/Cardano/Api.hs
@@ -337,18 +337,15 @@ module Cardano.Api (
     -- | Both 'PaymentCredential's and 'StakeCredential's can use scripts.
 
     -- ** Script languages
-    SimpleScriptV1,
-    SimpleScriptV2,
+    SimpleScript',
     PlutusScriptV1,
     PlutusScriptV2,
     ScriptLanguage(..),
-    SimpleScriptVersion(..),
     PlutusScriptVersion(..),
     AnyScriptLanguage(..),
     AnyPlutusScriptVersion(..),
     IsPlutusScriptLanguage(..),
     IsScriptLanguage(..),
-    IsSimpleScriptLanguage(..),
 
     -- ** Scripts in a specific language
     Script(..),
@@ -389,9 +386,6 @@ module Cardano.Api (
     -- ** Simple scripts
     -- | Making multi-signature and time-lock scripts.
     SimpleScript(..),
-    TimeLocksSupported(..),
-    timeLocksSupported,
-    adjustSimpleScriptVersion,
 
     -- ** Plutus scripts
     PlutusScript,