From b8e55c64a68763b0953945476cc75206f5354023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Smr=C5=BE?= Date: Tue, 17 May 2022 22:06:01 +0200 Subject: Mergeable class with separate component type --- src/Identity.hs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/Identity.hs') diff --git a/src/Identity.hs b/src/Identity.hs index b81228f..834e5ee 100644 --- a/src/Identity.hs +++ b/src/Identity.hs @@ -52,8 +52,8 @@ deriving instance Show (m (Stored (Signed IdentityData))) => Show (Identity m) type ComposedIdentity = Identity [] type UnifiedIdentity = Identity I.Identity -instance Eq UnifiedIdentity where - (==) = (==) `on` (idData &&& idUpdates) +instance Eq (m (Stored (Signed IdentityData))) => Eq (Identity m) where + (==) = (==) `on` (idData_ &&& idUpdates_) data IdentityData = IdentityData { iddPrev :: [Stored (Signed IdentityData)] @@ -79,6 +79,11 @@ instance Storable IdentityData where <*> loadRef "key-id" <*> loadMbRef "key-msg" +instance Mergeable (Maybe ComposedIdentity) where + type Component (Maybe ComposedIdentity) = Signed IdentityData + mergeSorted = validateIdentityF + toComponents = maybe [] idDataF + idData :: UnifiedIdentity -> Stored (Signed IdentityData) idData = I.runIdentity . idDataF -- cgit v1.2.3