From 3f29bdc88a068ec3eab91a8bac12757e3a106ceb Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Sat, 13 Jul 2019 21:18:22 -0400 Subject: Finished encapsulation of KeyDB. --- lib/Kiki.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/Kiki.hs') diff --git a/lib/Kiki.hs b/lib/Kiki.hs index e5c4eb4..e919b88 100644 --- a/lib/Kiki.hs +++ b/lib/Kiki.hs @@ -496,7 +496,7 @@ installIpsecConf fw MyIdentity{myGpgAddress} cs = do getMyIdentity :: KeyRingRuntime -> Maybe MyIdentity getMyIdentity rt = do wk <- rtWorkingKey rt - Hostnames wkaddr _ _ _ <- Just $ getHostnames (byKeyKey (rtKeyDB rt) Map.! keykey wk) + Hostnames wkaddr _ _ _ <- getHostnames <$> lookupKeyData (keykey wk) (rtKeyDB rt) return $ MyIdentity wkaddr (fingerprint wk) refreshCache :: KeyRingRuntime -> Maybe FilePath -> IO () @@ -543,7 +543,7 @@ newtype UidHostname = UidHostname Char8.ByteString newtype ResolvableHostname = ResolvableHostname Char8.ByteString listPeers :: KeyRingRuntime -> [Peer] -listPeers rt = map (uncurry Peer) . filter notme . mapMaybe namedContact . Map.elems . byKeyKey . rtKeyDB $ rt +listPeers rt = map (uncurry Peer) . filter notme . mapMaybe namedContact . keyData . rtKeyDB $ rt where kk = keykey (fromJust $ rtWorkingKey rt) notme (_,kd) = keykey (keyPacket kd) /= kk -- cgit v1.2.3