summaryrefslogtreecommitdiffhomepage
path: root/Types.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Types.hs')
-rw-r--r--Types.hs20
1 files changed, 17 insertions, 3 deletions
diff --git a/Types.hs b/Types.hs
index e20228d..699fa59 100644
--- a/Types.hs
+++ b/Types.hs
@@ -2,8 +2,9 @@
{- | Main types for debug-me
-
- - Note that changing types in ways that change the JSON serialization
- - changes debug-me's wire format.
+ - Note that changing types in ways that change the cereal serialization
+ - changes debug-me's wire format. Changing types in ways that change the
+ - aeson serialization changes debug-me's log format.
-}
module Types (
@@ -13,7 +14,7 @@ module Types (
import Val
import Memory
-import Json
+import Serialization
-- | Things that the developer sees.
data Seen = Seen
@@ -135,43 +136,56 @@ newtype GpgSig = GpgSig Val
instance DataSize GpgSig where
dataSize (GpgSig s) = dataSize s
+instance Serialize Seen
instance ToJSON Seen
instance FromJSON Seen
+instance Serialize Entered
instance ToJSON Entered
instance FromJSON Entered
+instance Serialize (Activity Seen)
instance ToJSON (Activity Seen)
instance FromJSON (Activity Seen)
+instance Serialize (Activity Entered)
instance ToJSON (Activity Entered)
instance FromJSON (Activity Entered)
+instance Serialize Control
instance ToJSON Control
instance FromJSON Control
+instance Serialize Hash
instance ToJSON Hash
instance FromJSON Hash
+instance Serialize HashMethod
instance ToJSON HashMethod
instance FromJSON HashMethod
+instance Serialize PublicKey
instance ToJSON PublicKey
instance FromJSON PublicKey
+instance Serialize GpgSig
instance ToJSON GpgSig
instance FromJSON GpgSig
+instance Serialize (Message Seen)
instance ToJSON (Message Seen) where
toJSON = genericToJSON sumOptions
toEncoding = genericToEncoding sumOptions
instance FromJSON (Message Seen) where
parseJSON = genericParseJSON sumOptions
+instance Serialize (Message Entered)
instance ToJSON (Message Entered) where
toJSON = genericToJSON sumOptions
toEncoding = genericToEncoding sumOptions
instance FromJSON (Message Entered) where
parseJSON = genericParseJSON sumOptions
+instance Serialize Signature
instance ToJSON Signature where
toJSON = genericToJSON sumOptions
toEncoding = genericToEncoding sumOptions
instance FromJSON Signature where
parseJSON = genericParseJSON sumOptions
+instance Serialize ControlAction
instance ToJSON ControlAction where
toJSON = genericToJSON sumOptions
toEncoding = genericToEncoding sumOptions