Remove type families from '*Opaque'

IntersectMBO · May 10, 2024 · 1f0d147 · 1f0d147
1 parent 94ff0ff
commit 1f0d147
Show file tree

Hide file tree

Showing 8 changed files with 187 additions and 394 deletions.
diff --git a/plutus-tx-plugin/src/PlutusTx/Compiler/Builtins.hs b/plutus-tx-plugin/src/PlutusTx/Compiler/Builtins.hs
@@ -18,8 +18,8 @@ module PlutusTx.Compiler.Builtins (
     , lookupBuiltinType
     , errorFunc) where
 
-import PlutusTx.Builtins.Class qualified as Builtins
 import PlutusTx.Builtins.Internal qualified as Builtins
+import PlutusTx.Builtins.IsBuiltin qualified as Builtins
 
 import PlutusTx.Compiler.Error
 import PlutusTx.Compiler.Names

diff --git a/plutus-tx-plugin/src/PlutusTx/Compiler/Expr.hs b/plutus-tx-plugin/src/PlutusTx/Compiler/Expr.hs
@@ -49,7 +49,7 @@ import PlutusTx.PIRTypes
 import PlutusTx.PLCTypes (PLCType, PLCVar)
 
 -- I feel like we shouldn't need this, we only need it to spot the special String type, which is annoying
-import PlutusTx.Builtins.Class qualified as Builtins
+import PlutusTx.Builtins.IsBuiltin qualified as Builtins
 import PlutusTx.Trace
 
 import PlutusIR qualified as PIR

diff --git a/plutus-tx-plugin/test/Plugin/Primitives/9.6/deconstructorData2.pir.golden b/plutus-tx-plugin/test/Plugin/Primitives/9.6/deconstructorData2.pir.golden
@@ -247,6 +247,14 @@
             )
           )
         )
+        (termbind
+          (nonstrict)
+          (vardecl
+            `$fHasFromOpaqueBuiltinDataBuiltinData_$cfromOpaque`
+            (fun (con data) (con data))
+          )
+          (lam eta (con data) eta)
+        )
         (termbind
           (strict)
           (vardecl
@@ -271,7 +279,7 @@
         (termbind
           (nonstrict)
           (vardecl
-            `$fFromBuiltinBuiltinListList_$cfromBuiltin`
+            `$fHasFromOpaqueBuiltinListList_$cfromOpaque`
             (all
               arep
               (type)
@@ -292,7 +300,7 @@
               a
               (type)
               (lam
-                `$dFromBuiltin`
+                `$dHasFromOpaque`
                 [ [ (lam arep (type) (lam a (type) (fun arep a))) arep ] a ]
                 (let
                   (rec)
@@ -323,7 +331,7 @@
                               [
                                 [
                                   { Cons a }
-                                  [ `$dFromBuiltin` [ { head arep } l ] ]
+                                  [ `$dHasFromOpaque` [ { head arep } l ] ]
                                 ]
                                 [ go [ { tail arep } l ] ]
                               ]
@@ -347,11 +355,6 @@
           )
           (builtin fstPair)
         )
-        (termbind
-          (nonstrict)
-          (vardecl id (all a (type) (fun a a)))
-          (abs a (type) (lam x a x))
-        )
         (termbind
           (strict)
           (vardecl
@@ -405,12 +408,12 @@
                     [
                       {
                         {
-                          `$fFromBuiltinBuiltinListList_$cfromBuiltin`
+                          `$fHasFromOpaqueBuiltinListList_$cfromOpaque`
                           (con data)
                         }
                         (con data)
                       }
-                      { id (con data) }
+                      `$fHasFromOpaqueBuiltinDataBuiltinData_$cfromOpaque`
                     ]
                     a
                   ]

diff --git a/plutus-tx/plutus-tx.cabal b/plutus-tx/plutus-tx.cabal
@@ -70,7 +70,6 @@ library
     PlutusTx.Blueprint.Write
     PlutusTx.Bool
     PlutusTx.Builtins
-    PlutusTx.Builtins.Class
     PlutusTx.Builtins.Internal
     PlutusTx.Builtins.IsBuiltin
     PlutusTx.Builtins.IsOpaque

diff --git a/plutus-tx/src/PlutusTx/Builtins/Class.hs b/plutus-tx/src/PlutusTx/Builtins/Class.hs