Factor out embedFile functions

cardano-foundation · Jan 31, 2025 · 20188bc · 20188bc
1 parent 13a411f
commit 20188bc
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 44 deletions.
diff --git a/lib/ui/cardano-wallet-ui.cabal b/lib/ui/cardano-wallet-ui.cabal
@@ -114,6 +114,7 @@ library
     Cardano.Wallet.UI.Shelley.Html.Pages.Wallets.NewWallet
     Cardano.Wallet.UI.Shelley.Server
     Cardano.Wallet.UI.Signal
+    Cardano.Wallet.UI.Static
     Cardano.Wallet.UI.Type
 
   other-modules:    Paths_cardano_wallet_ui

diff --git a/lib/ui/src/Cardano/Wallet/UI/Common/Handlers/Wallet.hs b/lib/ui/src/Cardano/Wallet/UI/Common/Handlers/Wallet.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeApplications #-}
 
 module Cardano.Wallet.UI.Common.Handlers.Wallet
@@ -21,35 +20,24 @@ import Cardano.Wallet.Api.Types
 import Control.Monad
     ( replicateM
     )
-import Data.ByteString
-    ( ByteString
-    )
-import Data.FileEmbed
-    ( embedFile
-    , makeRelativeToProject
-    )
 import Data.Text
     ( Text
     )
 import System.Random.Stateful
     ( randomRIO
     )
 
-import qualified Data.ByteString.Char8 as B8
-import qualified Data.Text.Encoding as T
+import Cardano.Wallet.UI.Static
+    ( englishWords
+    )
 
 pickMnemonic :: Int -> Maybe Bool -> IO (Maybe [Text])
 pickMnemonic _n (Just True) = pure Nothing
 pickMnemonic n _ = do
-    let wordsList :: ByteString
-        wordsList =
-            $(makeRelativeToProject "data/english.txt" >>= embedFile)
-    let dict = fmap T.decodeUtf8 . B8.words $ wordsList
-
     let loop = do
             xs <- replicateM n $ do
-                i <- randomRIO (0, length dict - 1)
-                pure $ dict !! i
+                i <- randomRIO (0, length englishWords - 1)
+                pure $ englishWords !! i
             case mkSomeMnemonic @(AllowedMnemonics 'Shelley) xs of
                 Left _ -> loop
                 Right _ -> pure xs

diff --git a/lib/ui/src/Cardano/Wallet/UI/Deposit/Server.hs b/lib/ui/src/Cardano/Wallet/UI/Deposit/Server.hs
@@ -3,7 +3,6 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeApplications #-}
 
 module Cardano.Wallet.UI.Deposit.Server
@@ -129,13 +128,12 @@ import Cardano.Wallet.UI.Deposit.Server.Wallet
     , serveWalletPage
     , serveWalletStatus
     )
+import Cardano.Wallet.UI.Static
+    ( favicon
+    )
 import Control.Tracer
     ( Tracer (..)
     )
-import Data.FileEmbed
-    ( embedFile
-    , makeRelativeToProject
-    )
 import Data.Functor
     ( ($>)
     )
@@ -152,7 +150,6 @@ import Servant.Types.SourceT
     )
 
 import qualified Cardano.Read.Ledger.Block.Block as Read
-import qualified Data.ByteString.Lazy as BL
 
 serveUI
     :: forall n
@@ -181,7 +178,7 @@ serveUI wtc tr ul env dbDir config nid nl bs =
         :<|> serveSSESettings ul
         :<|> serveToggleSSE ul
         :<|> serveSSE ul
-        :<|> serveFavicon
+        :<|> pure favicon
         :<|> serveMnemonic
         :<|> serveWalletPage ul
         :<|> servePostMnemonicWallet wtc tr env dbDir ul
@@ -239,12 +236,6 @@ serveNavigation ul mp = withSessionLayer ul $ \l -> do
     wp <- walletPresence l
     pure $ renderSmoothHtml $ headerElementH mp wp
 
-serveFavicon :: Handler BL.ByteString
-serveFavicon =
-    pure
-        $ BL.fromStrict
-            $(makeRelativeToProject "data/images/icon.png" >>= embedFile)
-
 serveNetworkInformation
     :: forall n
      . HasSNetworkId n

diff --git a/lib/ui/src/Cardano/Wallet/UI/Shelley/Server.hs b/lib/ui/src/Cardano/Wallet/UI/Shelley/Server.hs
@@ -4,7 +4,6 @@
 {-# LANGUAGE NoMonomorphismRestriction #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeApplications #-}
 
 module Cardano.Wallet.UI.Shelley.Server where
@@ -129,16 +128,15 @@ import Cardano.Wallet.UI.Shelley.Html.Pages.Wallet
 import Cardano.Wallet.UI.Shelley.Html.Pages.Wallets
     ( walletListH
     )
+import Cardano.Wallet.UI.Static
+    ( favicon
+    )
 import Control.Lens
     ( view
     )
 import Control.Monad.Trans
     ( MonadIO (..)
     )
-import Data.FileEmbed
-    ( embedFile
-    , makeRelativeToProject
-    )
 import Data.Functor
     ( ($>)
     )
@@ -159,8 +157,6 @@ import Servant
     , (:<|>) (..)
     )
 
-import qualified Data.ByteString.Lazy as BL
-
 pageHandler
     :: UILayer (Maybe WalletId)
     -> PageConfig
@@ -218,7 +214,7 @@ serveUI ul config _ alByron _alIcarus alShelley _alShared _spl _ntp bs =
         :<|> wsl (\l -> toggleSSE l $> RawHtml "")
         :<|> (\w -> wsl (\l -> selectWallet l w $> RawHtml ""))
         :<|> withSessionLayerRead ul (sse . sseConfig)
-        :<|> serveFavicon
+        :<|> pure favicon
   where
     ph = pageHandler ul config
     ok _ = renderHtml . rogerH @Text $ "ok"
@@ -229,9 +225,3 @@ serveUI ul config _ alByron _alIcarus alShelley _alShared _spl _ntp bs =
         NodeSource{} -> Node
     _ = networkInfoH
     wsl = withSessionLayer ul
-
-serveFavicon :: Handler BL.ByteString
-serveFavicon =
-    pure
-        $ BL.fromStrict
-            $(makeRelativeToProject "data/images/icon.png" >>= embedFile)
diff --git a/lib/ui/src/Cardano/Wallet/UI/Static.hs b/lib/ui/src/Cardano/Wallet/UI/Static.hs
@@ -0,0 +1,28 @@
+{-# LANGUAGE TemplateHaskell #-}
+
+module Cardano.Wallet.UI.Static
+    ( favicon
+    , englishWords
+    )
+where
+
+import Prelude
+
+import Data.FileEmbed
+import Data.Text
+    ( Text
+    )
+
+import qualified Data.ByteString.Char8 as B8
+import qualified Data.ByteString.Lazy as BL
+import qualified Data.Text.Encoding as T
+
+favicon :: BL.ByteString
+favicon =
+    BL.fromStrict
+        $(makeRelativeToProject "data/images/icon.png" >>= embedFile)
+
+englishWords :: [Text]
+englishWords =
+    fmap T.decodeUtf8 . B8.words
+        $ $(makeRelativeToProject "data/english.txt" >>= embedFile)