bfx dead code elimination

Author: functora

pub/bfx/bfx.cabal

@@ -92,18 +92,14 @@ common pkg-lib
     , functora
     , functora:cfg
     , functora:money
-    , functora:sql
     , http-client
     , http-client-tls
     , http-types
-    , katip
     , lens-aeson
     , memory
     , siggy-chardust
-    , temporary
+    , singlethongs
     , text
-    , transformers
-    , unliftio
     , vector
 
 library
@@ -131,16 +127,12 @@ library
     Bfx.Data.Type
     Bfx.Data.Wallets
     Bfx.Data.Web
-    Bfx.Import
-    Bfx.Import.External
-    Bfx.Import.Internal
     Bfx.Indicator.Atr
     Bfx.Indicator.Ma
     Bfx.Indicator.Tr
     Bfx.Math
     Bfx.Parser
     Bfx.Rpc.Generic
-    Bfx.Util
 
 test-suite bfx-test
   import:         pkg
@@ -161,6 +153,8 @@ test-suite bfx-test
     , base
     , bfx
     , containers
+    , functora
+    , functora:money
     , hspec
 
   if flag(ghcid)
@@ -182,16 +176,12 @@ test-suite bfx-test
       Bfx.Data.Type
       Bfx.Data.Wallets
       Bfx.Data.Web
-      Bfx.Import
-      Bfx.Import.External
-      Bfx.Import.Internal
       Bfx.Indicator.Atr
       Bfx.Indicator.Ma
       Bfx.Indicator.Tr
       Bfx.Math
       Bfx.Parser
       Bfx.Rpc.Generic
-      Bfx.Util
 
     hs-source-dirs: src
     ghc-options:    -Wno-unused-packages
@@ -203,21 +193,15 @@ test-suite bfx-test
       , containers
       , cryptonite
       , envparse
-      , functora
       , functora:cfg
-      , functora:money
-      , functora:sql
       , http-client
       , http-client-tls
       , http-types
-      , katip
       , lens-aeson
       , memory
       , siggy-chardust
-      , temporary
+      , singlethongs
       , text
-      , transformers
-      , unliftio
       , vector
 
   else

pub/bfx/src/Bfx.hs

@@ -30,21 +30,33 @@ module Bfx
   )
 where
 
+import Bfx.Class.FromRpc as X
+import Bfx.Class.ToBaseUrl as X
+import Bfx.Class.ToPathPieces as X
+import Bfx.Class.ToRequestMethod as X
+import Bfx.Class.ToRequestParam as X
 import qualified Bfx.Data.CancelOrderMulti as CancelOrderMulti
 import qualified Bfx.Data.Candles as Candles
+import Bfx.Data.Env as X
 import qualified Bfx.Data.FeeSummary as FeeSummary
 import qualified Bfx.Data.GetOrders as GetOrders
+import Bfx.Data.Kind as X
 import qualified Bfx.Data.MarketAveragePrice as MarketAveragePrice
 import qualified Bfx.Data.SubmitOrder as SubmitOrder
+import Bfx.Data.Type as X
 import qualified Bfx.Data.Wallets as Wallets
-import Bfx.Import
-import Bfx.Import.Internal as X
+import Bfx.Data.Web as X
 import Bfx.Indicator.Atr as X
 import Bfx.Indicator.Ma as X
 import Bfx.Indicator.Tr as X
+import Bfx.Math as X
+import Bfx.Parser as X
 import qualified Bfx.Rpc.Generic as Generic
+import Control.Concurrent (threadDelay)
 import qualified Data.Map as Map
 import qualified Data.Set as Set
+import Functora.Money
+import Functora.Prelude
 
 platformStatus ::
   ( MonadThrow m,

pub/bfx/src/Bfx/Class/FromRpc.hs

@@ -10,13 +10,14 @@ import Bfx.Data.Kind
 import Bfx.Data.Type
 import qualified Bfx.Data.Wallets as Wallets
 import Bfx.Data.Web
-import Bfx.Import.External
 import Bfx.Math
 import Bfx.Parser
 import Data.Aeson.Lens
 import qualified Data.Map as Map
 import qualified Data.Text as T
 import qualified Data.Vector as V
+import Functora.Money
+import Functora.Prelude
 
 class FromRpc (method :: Method) res where
   fromRpc :: RawResponse -> Either Text res

pub/bfx/src/Bfx/Class/ToPathPieces.hs

@@ -9,7 +9,7 @@ import Bfx.Class.ToRequestParam
 import qualified Bfx.Data.Candles as Candles
 import qualified Bfx.Data.GetOrders as GetOrders
 import Bfx.Data.Kind
-import Bfx.Import.External
+import Functora.Prelude
 
 class ToPathPieces (method :: Method) req where
   toPathPieces :: req -> [Text]

pub/bfx/src/Bfx/Class/ToRequestParam.hs

@@ -8,9 +8,10 @@ module Bfx.Class.ToRequestParam
 where
 
 import Bfx.Data.Web
-import Bfx.Import.External
 import qualified Data.ByteString as BS
 import qualified Data.Text as T
+import Functora.Money
+import Functora.Prelude
 import qualified Prelude
 
 class ToRequestParam a where

pub/bfx/src/Bfx/Data/CancelOrderMulti.hs

@@ -5,8 +5,11 @@ module Bfx.Data.CancelOrderMulti
   )
 where
 
-import Bfx.Import
+import Bfx.Data.Type
 import qualified Data.Aeson as A
+import Functora.Cfg
+import Functora.Money
+import Functora.Prelude
 
 data Request
   = ByOrderId (Set OrderId)

pub/bfx/src/Bfx/Data/Candles.hs

@@ -8,8 +8,10 @@ module Bfx.Data.Candles
   )
 where
 
-import Bfx.Import
+import Bfx.Class.ToRequestParam
+import Bfx.Data.Type
 import qualified Data.Text as T
+import Functora.Prelude
 import qualified Prelude
 
 data Section

pub/bfx/src/Bfx/Data/Env.hs

@@ -8,7 +8,6 @@ module Bfx.Data.Env
 where
 
 import Bfx.Data.Web
-import Bfx.Import.External
 import Env
   ( Mod,
     Var,
@@ -19,6 +18,7 @@ import Env
     str,
     var,
   )
+import Functora.Prelude
 
 data Env = Env
   { envNonceGen :: NonceGen,

pub/bfx/src/Bfx/Data/FeeSummary.hs

@@ -7,7 +7,8 @@ module Bfx.Data.FeeSummary
 where
 
 import Bfx.Data.Type
-import Bfx.Import.External
+import Functora.Money
+import Functora.Prelude
 
 --
 -- TODO : this is not 100% correct

pub/bfx/src/Bfx/Data/GetOrders.hs

@@ -9,7 +9,8 @@ module Bfx.Data.GetOrders
 where
 
 import Bfx.Data.Type
-import Bfx.Import
+import Functora.Cfg
+import Functora.Prelude
 
 data Options = Options
   { currencyPair :: Maybe CurrencyPair,