[CBR-379] Unify prefilterBlockForWallets and prefilterBlock

Author: uroboros

src/Cardano/Wallet/Kernel/BListener.hs

@@ -44,7 +44,7 @@ import           Cardano.Wallet.Kernel.DB.TxMeta.Types
 import           Cardano.Wallet.Kernel.Internal
 import qualified Cardano.Wallet.Kernel.NodeStateAdaptor as Node
 import           Cardano.Wallet.Kernel.PrefilterTx (PrefilteredBlock (..),
-                     prefilterBlockForWallets)
+                     prefilterBlock)
 import           Cardano.Wallet.Kernel.Read (getWalletCredentials)
 import           Cardano.Wallet.Kernel.Restore
 import qualified Cardano.Wallet.Kernel.Submission as Submission
@@ -70,7 +70,7 @@ prefilterBlock' pw b = do
     aux :: [(WalletId, EncryptedSecretKey)]
         -> ((BlockContext, Map HdAccountId PrefilteredBlock), [TxMeta])
     aux ws =
-      let (conMap, conMeta) = prefilterBlockForWallets b ws
+      let (conMap, conMeta) = prefilterBlock b ws
       in ((b ^. rbContext, conMap), conMeta)
 
 data BackfillFailed

src/Cardano/Wallet/Kernel/PrefilterTx.hs

@@ -7,7 +7,6 @@ module Cardano.Wallet.Kernel.PrefilterTx
        , emptyPrefilteredBlock
        , AddrWithId
        , prefilterBlock
-       , prefilterBlockForWallets
        , prefilterUtxo
        , UtxoWithAddrId
        , prefilterUtxo'
@@ -282,10 +281,10 @@ extendWithSummary (onlyOurInps,onlyOurOuts) utxoWithAddrId
 -- | Prefilter the transactions of a resolved block for the given wallets.
 --
 --   Returns prefiltered blocks indexed by HdAccountId.
-prefilterBlockForWallets :: ResolvedBlock
-                         -> [(WalletId, EncryptedSecretKey)]
-                         -> (Map HdAccountId PrefilteredBlock, [TxMeta])
-prefilterBlockForWallets block rawKeys =
+prefilterBlock :: ResolvedBlock
+               -> [(WalletId, EncryptedSecretKey)]
+               -> (Map HdAccountId PrefilteredBlock, [TxMeta])
+prefilterBlock block rawKeys =
       (Map.fromList
     $ map (mkPrefBlock (block ^. rbContext) inpAll outAll)
     $ Set.toList accountIds
@@ -310,14 +309,6 @@ prefilterBlockForWallets block rawKeys =
     toWalletKey :: (WalletId, EncryptedSecretKey) -> WalletKey
     toWalletKey (wid, esk) = (wid, keyToWalletDecrCredentials $ KeyForRegular esk)
 
--- Prefilter a block for a single wallet
-prefilterBlock :: ResolvedBlock
-               -> WalletId
-               -> EncryptedSecretKey
-               -> (Map HdAccountId PrefilteredBlock, [TxMeta])
-prefilterBlock block wid esk =
-    prefilterBlockForWallets block [(wid, esk)]
-
 mkPrefBlock :: BlockContext
             -> Map HdAccountId (Set TxIn)
             -> Map HdAccountId (Map TxIn (TxOutAux, AddressSummary))

src/Cardano/Wallet/Kernel/Restore.hs

@@ -163,7 +163,7 @@ mkPrefilter :: Kernel.PassiveWallet
             -> IO (Map HD.HdAccountId PrefilteredBlock, [TxMeta])
 mkPrefilter pw wId esk blund = blundToResolvedBlock (pw ^. walletNode) blund <&> \case
     Nothing -> (M.empty, [])
-    Just rb -> prefilterBlock rb wId esk
+    Just rb -> prefilterBlock rb [(wId,esk)]
 
 -- | Begin a restoration for a wallet that is already known. This is used
 -- to put an existing wallet back into a restoration state when something has

src/Cardano/Wallet/WalletLayer/Kernel/Wallets.hs

@@ -161,7 +161,7 @@ prefilter :: EncryptedSecretKey
 prefilter esk wallet wId blund =
     blundToResolvedBlock (wallet ^. Kernel.walletNode) blund <&> \case
         Nothing -> (Map.empty, [])
-        Just rb -> prefilterBlock rb wId esk
+        Just rb -> prefilterBlock rb [(wId,esk)]
 
 -- | Updates the 'SpendingPassword' for this wallet.
 updateWallet :: MonadIO m