Remove principals from primitive types as per PR comments

kadena-io · Oct 30, 2023 · b756a96 · b756a96
1 parent cb5fc24
commit b756a96
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 20 deletions.
diff --git a/pact-core/Pact/Core/Errors.hs b/pact-core/Pact/Core/Errors.hs
@@ -221,7 +221,6 @@ data ArgTypeError
   | ATETable
   | ATEClosure
   | ATEModRef
-  | ATEPrincipal
   deriving (Show)
 
 instance Pretty ArgTypeError where
@@ -232,7 +231,6 @@ instance Pretty ArgTypeError where
     ATETable -> "[table]"
     ATEClosure -> "[closure]"
     ATEModRef -> "[modref]"
-    ATEPrincipal -> "[principal]"
 
 
 -- | All fatal execution errors which should pause

diff --git a/pact-core/Pact/Core/IR/Eval/Runtime/Utils.hs b/pact-core/Pact/Core/IR/Eval/Runtime/Utils.hs
@@ -284,7 +284,6 @@ toArgTypeError = \case
     PGuard _ -> ATEPrim PrimGuard
     PModRef _ -> ATEModRef
     PCapToken _ -> ATEClosure
-    PPrincipal _ -> ATEPrincipal
   VTable{} -> ATETable
   VClosure{} -> ATEClosure
 

diff --git a/pact-core/Pact/Core/PactValue.hs b/pact-core/Pact/Core/PactValue.hs
@@ -37,7 +37,6 @@ import Pact.Core.Literal
 import Pact.Core.Pretty
 import Pact.Core.ModRefs
 import Pact.Core.Capabilities
-import Pact.Core.Principal
 
 import qualified Pact.Core.Pretty as Pretty
 
@@ -49,7 +48,6 @@ data PactValue
   | PModRef ModRef
   | PCapToken (CapToken FullyQualifiedName PactValue)
   | PTime !PactTime.UTCTime
-  | PPrincipal !Principal
   deriving (Eq, Show, Ord)
 
 makePrisms ''PactValue
@@ -81,7 +79,6 @@ instance Pretty PactValue where
     PCapToken (CapToken fqn args) ->
       parens (pretty (fqnToQualName fqn) <> if null args then mempty else hsep (pretty <$> args))
     PTime t -> pretty (PactTime.formatTime "%Y-%m-%d %H:%M:%S%Q %Z" t)
-    PPrincipal p -> pretty $ mkPrincipalIdent p
 
 
 -- | Check that a `PactValue` has the provided `Type`, returning
@@ -125,9 +122,6 @@ checkPvType ty = \case
   PTime _ -> case ty of
     TyTime -> Just TyTime
     _ -> Nothing
-  PPrincipal _ -> case ty of
-    TyPrincipal -> Just TyPrincipal
-    _ -> Nothing
 
 
 

diff --git a/pact-core/Pact/Core/StableEncoding.hs b/pact-core/Pact/Core/StableEncoding.hs
@@ -198,7 +198,6 @@ instance J.Encode (StableEncoding PactValue) where
     PModRef mr -> J.build (StableEncoding mr)
     PCapToken _ct -> error "not implemented"
     PTime pt -> J.build (StableEncoding pt)
-    PPrincipal pr -> J.build (StableEncoding pr)
   {-# INLINABLE build #-}
 
 -- | Stable encoding of `PactContinuation FullyQualifiedName PactValue`

diff --git a/pact-core/Pact/Core/Syntax/LexUtils.hs b/pact-core/Pact/Core/Syntax/LexUtils.hs
@@ -216,7 +216,6 @@ primType i = \case
   "list" -> pure TyPolyList
   "object" -> pure TyPolyObject
   "keyset" -> pure TyKeyset
-  "principal" -> pure TyPrincipal
   e -> throwParseError (InvalidBaseType e) i
 
 objType :: SpanInfo -> Text -> ParsedTyName -> ParserT Type

diff --git a/pact-core/Pact/Core/Syntax/ParseTree.hs b/pact-core/Pact/Core/Syntax/ParseTree.hs
@@ -70,9 +70,6 @@ pattern TyUnit = TyPrim PrimUnit
 pattern TyGuard :: Type
 pattern TyGuard = TyPrim PrimGuard
 
-pattern TyPrincipal :: Type
-pattern TyPrincipal = TyPrim PrimPrincipal
-
 instance Pretty Type where
   pretty = \case
     TyPrim prim -> pretty prim

diff --git a/pact-core/Pact/Core/Type.hs b/pact-core/Pact/Core/Type.hs
@@ -16,7 +16,6 @@ module Pact.Core.Type
  , pattern TyTime
  , pattern TyBool
  , pattern TyString
- , pattern TyPrincipal
  , pattern TyUnit
  , pattern TyGuard
  , typeOfLit
@@ -54,7 +53,6 @@ data PrimType =
   PrimString |
   PrimGuard |
   PrimTime |
-  PrimPrincipal |
   PrimUnit
   deriving (Eq,Ord,Show, Enum, Bounded)
 
@@ -66,7 +64,6 @@ instance Pretty PrimType where
     PrimString -> "string"
     PrimGuard -> "guard"
     PrimTime -> "time"
-    PrimPrincipal -> "principal"
     PrimUnit -> "unit"
 
 -- Todo: caps are a bit strange here
@@ -114,9 +111,6 @@ pattern TyBool = TyPrim PrimBool
 pattern TyString :: Type
 pattern TyString = TyPrim PrimString
 
-pattern TyPrincipal :: Type
-pattern TyPrincipal = TyPrim PrimPrincipal
-
 pattern TyUnit :: Type
 pattern TyUnit = TyPrim PrimUnit