[Builtins] Added 'Data' as a built-in type (IntersectMBO#3385)

sarvex · Jul 1, 2021 · b2ea280 · b2ea280
1 parent b554ea6
commit b2ea280
Show file tree

Hide file tree

Showing 261 changed files with 1,419 additions and 1,960 deletions.
diff --git a/doc/plutus/tutorials/basic-minting-policies.rst b/doc/plutus/tutorials/basic-minting-policies.rst
@@ -17,7 +17,7 @@ Minting policies, like validators, receive some information from the validating
 
 The minting policy is a function which receives these two inputs as *arguments*.
 The validating node is responsible for passing them in and running the minting policy.
-As with validator scripts, the arguments are passed encoded as :hsobj:`PlutusTx.Data.Data`.
+As with validator scripts, the arguments are passed encoded as :hsobj:`PlutusCore.Data.Data`.
 
 Using the minting context
 -------------------------

diff --git a/doc/plutus/tutorials/basic-validators.rst b/doc/plutus/tutorials/basic-validators.rst
@@ -25,7 +25,7 @@ The ``Data`` type
 But how are the validator's arguments passed?
 At least the redeemer and datum can be of different types depending on the script.
 
-The answer is that we pass them as a generic structured data type :hsobj:`PlutusTx.Data.Data`.
+The answer is that we pass them as a generic structured data type :hsobj:`PlutusCore.Data.Data`.
 ``Data`` is designed to make it easy to encode structured data into it, and to be itself encoded as CBOR.
 
 Consequently, the validator scripts we will write in this tutorial take three arguments of type ``Data``.

diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-core.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-core.nix
diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-tx.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-tx.nix
diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-core.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-core.nix
diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-tx.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-tx.nix
diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/plutus-core.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/plutus-core.nix
diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/plutus-tx.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/plutus-tx.nix
diff --git a/playground-common/src/PSGenerator/Common.hs b/playground-common/src/PSGenerator/Common.hs
@@ -169,7 +169,7 @@ psAssocMap =
 dataBridge :: BridgePart
 dataBridge = do
     typeName ^== "Data"
-    typeModule ^== "PlutusTx.Data"
+    typeModule ^== "PlutusCore.Data"
     pure psString
 
 assocMapBridge :: BridgePart

diff --git a/plutus-core/generators/PlutusCore/Generators/Interesting.hs b/plutus-core/generators/PlutusCore/Generators/Interesting.hs
@@ -16,7 +16,7 @@ module PlutusCore.Generators.Interesting
     , genNaiveFib
     , genNatRoundtrip
     , natSum
-    , genListSum
+    , genScottListSum
     , genIfIntegers
     , fromInterestingTermGens
     ) where
@@ -30,19 +30,19 @@ import           PlutusCore.Name
 import           PlutusCore.Quote
 
 import           PlutusCore.StdLib.Data.Bool
-import           PlutusCore.StdLib.Data.Function as Function
-import           PlutusCore.StdLib.Data.List     as List
+import           PlutusCore.StdLib.Data.Function  as Function
 import           PlutusCore.StdLib.Data.Nat
+import           PlutusCore.StdLib.Data.ScottList as ScottList
 import           PlutusCore.StdLib.Data.Unit
 import           PlutusCore.StdLib.Meta
 import           PlutusCore.StdLib.Type
 
 import           PlutusCore.Generators
 
-import           Data.List                       (genericIndex)
-import           Hedgehog                        hiding (Size, Var)
-import qualified Hedgehog.Gen                    as Gen
-import qualified Hedgehog.Range                  as Range
+import           Data.List                        (genericIndex)
+import           Hedgehog                         hiding (Size, Var)
+import qualified Hedgehog.Gen                     as Gen
+import qualified Hedgehog.Range                   as Range
 
 -- | The type of terms-and-their-values generators.
 type TermGen a = Gen (TermOf (Term TyName Name DefaultUni DefaultFun ()) a)
@@ -77,8 +77,8 @@ factorial = runQuote $ do
     let int = mkTyBuiltin @_ @Integer ()
     return
         . LamAbs () i int
-        . apply () List.product
-        $ mkIterApp () List.enumFromTo
+        . apply () ScottList.product
+        $ mkIterApp () ScottList.enumFromTo
             [ mkConstant @Integer () 1
             , Var () i
             ]
@@ -172,13 +172,13 @@ natSum = runQuote $ do
 
 -- | Generate a list of 'Integer's, turn it into a Scott-encoded PLC @List@ (see 'List'),
 -- sum elements of the list (see 'Sum') and return it along with the sum of the original list.
-genListSum :: TermGen Integer
-genListSum = do
+genScottListSum :: TermGen Integer
+genScottListSum = do
     let typedInt = AsKnownType
         intS = toTypeAst typedInt
     ps <- Gen.list (Range.linear 0 10) $ genTypedBuiltinDef typedInt
-    let list = metaListToList intS $ Prelude.map _termOfTerm ps
-        term = apply () List.sum list
+    let list = metaListToScottList intS $ Prelude.map _termOfTerm ps
+        term = apply () ScottList.sum list
     let haskSum = Prelude.sum $ Prelude.map _termOfValue ps
     return $ TermOf term haskSum
 
@@ -259,7 +259,7 @@ fromInterestingTermGens f =
     , f "factorial"        genFactorial
     , f "fibonacci"        genNaiveFib
     , f "NatRoundTrip"     genNatRoundtrip
-    , f "ListSum"          genListSum
+    , f "ScottListSum"     genScottListSum
     , f "IfIntegers"       genIfIntegers
     , f "ApplyAdd1"        genApplyAdd1
     , f "ApplyAdd2"        genApplyAdd2

diff --git a/plutus-core/plutus-core.cabal b/plutus-core/plutus-core.cabal
@@ -47,19 +47,27 @@ library
         PlutusCore.Constant
         PlutusCore.Constant.Dynamic.Emit
         PlutusCore.Core
+        PlutusCore.Data
         PlutusCore.DataFilePaths
         PlutusCore.DeBruijn
         PlutusCore.Default
         PlutusCore.Error
-        PlutusCore.Evaluation.Machine.Ck
         PlutusCore.Evaluation.Machine.BuiltinCostModel
+        PlutusCore.Evaluation.Machine.Ck
         PlutusCore.Evaluation.Machine.CostModelInterface
         PlutusCore.Evaluation.Machine.ExBudget
-        PlutusCore.Evaluation.Machine.Exception
         PlutusCore.Evaluation.Machine.ExMemory
+        PlutusCore.Evaluation.Machine.Exception
         PlutusCore.Evaluation.Machine.MachineParameters
         PlutusCore.Evaluation.Result
         PlutusCore.Examples.Builtins
+        PlutusCore.Examples.Data.Data
+        PlutusCore.Examples.Data.InterList
+        PlutusCore.Examples.Data.List
+        PlutusCore.Examples.Data.Pair
+        PlutusCore.Examples.Data.Shad
+        PlutusCore.Examples.Data.TreeForest
+        PlutusCore.Examples.Data.Vec
         PlutusCore.Examples.Everything
         PlutusCore.Flat
         PlutusCore.FsTree
@@ -84,10 +92,13 @@ library
         PlutusCore.Rename.Monad
         PlutusCore.StdLib.Data.Bool
         PlutusCore.StdLib.Data.ChurchNat
+        PlutusCore.StdLib.Data.Data
         PlutusCore.StdLib.Data.Function
         PlutusCore.StdLib.Data.Integer
         PlutusCore.StdLib.Data.List
         PlutusCore.StdLib.Data.Nat
+        PlutusCore.StdLib.Data.Pair
+        PlutusCore.StdLib.Data.ScottList
         PlutusCore.StdLib.Data.ScottUnit
         PlutusCore.StdLib.Data.Sum
         PlutusCore.StdLib.Data.Unit
@@ -172,10 +183,6 @@ library
         PlutusCore.Default.Universe
         PlutusCore.Eq
         PlutusCore.Evaluation.Machine.ExBudgetingDefaults
-        PlutusCore.Examples.Data.InterList
-        PlutusCore.Examples.Data.Shad
-        PlutusCore.Examples.Data.TreeForest
-        PlutusCore.Examples.Data.Vec
         PlutusCore.Generators.Internal.Denotation
         PlutusCore.Generators.Internal.Dependent
         PlutusCore.Generators.Internal.Entity