1 files changed, 11 insertions, 11 deletions

diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs
index 1d52dd1..b946e54 100644
--- a/lib/KeyRing.hs
+++ b/lib/KeyRing.hs
@@ -73,7 +73,7 @@ import           KeyRing.BuildKeyDB          (Hostnames(..),
                                               buildKeyDB,
                                               combineTransforms,
                                               filterMatches,
-                                              fingerdress, flattenKeys,
+                                              fingerdress,
                                               generateInternals,
                                               getHostnames, getSubkeys,
                                               importSecretKey,
@@ -84,8 +84,8 @@ import           KeyRing.BuildKeyDB          (Hostnames(..),
                                               parseSingleSpec,
                                               parseSpec, readInputFileL,
                                               readSecretPEMFile,
-                                              secp256k1_id, seek_key,
-                                              selectKey0, selectPublicKey,
+                                              secp256k1_id,
+                                              selectPublicKey,
                                               usageFromFilter)
 
 import KeyRing.Types
@@ -412,10 +412,10 @@ selectPublicKeyAndSigs :: (KeySpec,Maybe String) -> KeyDB -> [(KeyKey,Packet,[Pa
 selectPublicKeyAndSigs (spec,mtag) db =
     case mtag of
         Nothing -> do
-            (kk,r) <- Map.toList $ fmap (findbyspec spec) (byKeyKey db)
+            (kk,r) <- fmap (second $ findbyspec spec) (kkData db)
             (sub,sigs) <- r
             return (kk,sub,sigs)
-        Just tag -> Map.toList (Map.filter (matchSpec spec) (byKeyKey db)) >>= findsubs tag
+        Just tag -> filterMatches spec (kkData db) >>= findsubs tag
  where
     topresult kd = (keyPacket kd, map (packet .fst) $ keySigAndTrusts kd)
 
@@ -600,7 +600,7 @@ coinKeysOwnedBy :: KeyDB -> Maybe Packet -> [(CryptoCoins.CoinNetwork,MappedPack
 coinKeysOwnedBy db wk = do
     wk <- maybeToList wk
     let kk = keykey wk
-    KeyData top topsigs uids subs <- maybeToList $ Map.lookup kk (byKeyKey db)
+    KeyData top topsigs uids subs <- maybeToList $ lookupKeyData kk db
     (subkk,SubKey mp sigs) <- Map.toList subs
     let sub = packet mp
     guard $ isCryptoCoinKey sub
@@ -664,7 +664,7 @@ guardAuthentic rt keydata = guard (isauth rt keydata)
 
 isauth :: KeyRingRuntime -> KeyData -> Bool
 isauth rt keydata = dont_have keydata && maybe False (`has_good_sig` keydata) wk
-          where wk = workingKey (rtGrip rt) (byKeyKey $ rtKeyDB rt)
+          where wk = workingKey (rtGrip rt) (rtKeyDB rt)
                 dont_have (KeyData p _ _ _) = not . Map.member (rtPubring rt)
                                                    $ locations p
                 has_good_sig wk (KeyData k sigs uids subs) = any goodsig $ Map.toList uids
@@ -676,7 +676,7 @@ isauth rt keydata = dont_have keydata && maybe False (`has_good_sig` keydata) wk
 
                 workingKey grip use_db = listToMaybe $ do
                             fp <- maybeToList grip
-                            elm <- Map.elems use_db
+                            elm <- keyData use_db
                             guard $ matchSpec (KeyGrip fp) elm
                             return $ keyPacket elm
 
@@ -731,7 +731,7 @@ writeRingKeys krd rt {- db wk secring pubring -} unspilled report_manips = do
                               (error $ f ++ ": write public or secret key to file?")
                     importByExistingMaster kd@(KeyData p _ _ _) =
                         fmap originallyPublic $ Map.lookup f $ locations p
-                d <- sortByHint f keyMappedPacket (Map.elems $ byKeyKey db')
+                d <- sortByHint f keyMappedPacket (keyData db')
                 acc <- maybeToList $ Map.lookup f0 (rtRingAccess rt)
                 only_public <- maybeToList $ wantedForFill acc (fill stream) d
                 guard $ only_public || isSecretKey (keyPacket d)
@@ -984,7 +984,7 @@ initializeMissingPEMFiles operation ctx grip mwk transcode db = do
                     -- ms =  map (keykey . fst) $ selectAll True (topspec,subspec) db
                     -- ms = filterMatches topspec $ Map.toList db
                     ns = do
-                       (kk,kd) <- filterMatches topspec $ Map.toList $ byKeyKey db
+                       (kk,kd) <- filterMatches topspec $ kkData db
                        return (kk , subkeysForExport subspec kd)
                 return (fname,subspec,ns,stream)
             (exports0,ambiguous) = partition (\(_,_,ns,_)->null $ drop 1 $ (ns>>=snd))
@@ -1032,7 +1032,7 @@ initializeMissingPEMFiles operation ctx grip mwk transcode db = do
                     usage <- take 1 $ mapMaybe usageFromFilter [fill stream,spill stream]
                     let (topspec,subspec) = parseSpec (fromMaybe "" grip) usage
                     guard $ null $ do
-                        (kk,kd) <- filterMatches topspec $ Map.toList $ byKeyKey db
+                        (kk,kd) <- filterMatches topspec $ kkData db
                         subkeysForExport subspec kd
                     return (f,stream)
                 where