rework: use withWorkerCtx helper function in server

cardano-foundation · Jan 22, 2021 · bf956e0 · bf956e0
1 parent 0d6d568
commit bf956e0
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/lib/core/src/Cardano/Wallet/Api/Server.hs b/lib/core/src/Cardano/Wallet/Api/Server.hs
@@ -1277,13 +1277,12 @@ listAssets
     => ctx
     -> ApiT WalletId
     -> Handler [ApiAsset]
-listAssets ctx (ApiT wid) =
-    Handler $ ExceptT $ withDatabase df wid $ \db -> runHandler $ do
-        let wrk = hoistResource db (MsgFromWorker wid) ctx
-        (cp, _meta, _pending) <- liftHandler $ W.readWallet @_ @s @k wrk wid
-        pure $ map (toApiAsset metadata) $ F.toList $ W.getAssets $ cp ^. #utxo
+listAssets ctx (ApiT wid) = do
+    utxo <- withWorkerCtx @_ @s @k ctx wid liftE liftE $ \wrk -> liftHandler $ do
+       (cp, _meta, _pending) <- W.readWallet @_ @s @k wrk wid
+       pure (cp ^. #utxo)
+    pure $ map (toApiAsset metadata) $ F.toList $ W.getAssets utxo
   where
-    df = ctx ^. dbFactory @s @k
     metadata = Nothing  -- TODO: Use data from metadata server
 
 getAsset