Moved Driver.Real.Types to Driver.Types

robocom-zero.cabal

@@ -68,7 +68,7 @@ library
   other-modules:       ATrade.Exceptions
                      , ATrade.Driver.Real.BrokerClientThread
                      , ATrade.Driver.Real.QuoteSourceThread
-                     , ATrade.Driver.Real.Types
+                     , ATrade.Driver.Types
 
 test-suite robots-test
   type:                exitcode-stdio-1.0

src/ATrade/Driver/Backtest.hs

@@ -2,15 +2,15 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE LambdaCase                 #-}
 {-# LANGUAGE OverloadedStrings          #-}
+{-# LANGUAGE QuasiQuotes                #-}
 {-# LANGUAGE RankNTypes                 #-}
 {-# LANGUAGE ScopedTypeVariables        #-}
-{-# LANGUAGE QuasiQuotes        #-}
 
 module ATrade.Driver.Backtest (
   backtestMain
 ) where
 
-import           ATrade.Driver.Real.Types (InitializationCallback,
+import           ATrade.Driver.Types      (InitializationCallback,
                                            Strategy (..),
                                            StrategyInstanceParams (..))
 import           ATrade.Exceptions
@@ -18,8 +18,7 @@ import           ATrade.Quotes.Finam      as QF
 import           ATrade.RoboCom.Monad     (Event (..), EventCallback,
                                            StrategyAction (..),
                                            StrategyEnvironment (..),
-                                           runStrategyElement, st,
+                                           appendToLog, runStrategyElement, st)
-                                           appendToLog)
 import           ATrade.RoboCom.Positions
 import           ATrade.RoboCom.Types     (BarSeries (..), Ticker (..),
                                            Timeframe (..))
@@ -273,7 +272,7 @@ backtestMain dataDownloadDelta defaultState initCallback callback = do
       Just bs -> Just bs { bsBars = updateBarList newbar (bsBars bs) }) (barSecurity newbar) barMap
 
     updateBarList newbar (_:bs) = newbar:newbar:bs
-    updateBarList newbar _ = newbar:[newbar]
+    updateBarList newbar _      = newbar:[newbar]
 
     fireTimers ts = do
       (firedTimers, otherTimers) <- partition (< ts) <$> gets pendingTimers

src/ATrade/Driver/Real.hs

@@ -45,7 +45,7 @@ import ATrade.RoboCom.Monad (StrategyMonad, StrategyAction(..), EventCallback, E
 import ATrade.BarAggregator
 import ATrade.Driver.Real.BrokerClientThread
 import ATrade.Driver.Real.QuoteSourceThread
-import ATrade.Driver.Real.Types (Strategy(..), StrategyInstanceParams(..), InitializationCallback)
+import ATrade.Driver.Types (Strategy(..), StrategyInstanceParams(..), InitializationCallback)
 import ATrade.RoboCom.Types (BarSeries(..), Ticker(..), Timeframe(..))
 import ATrade.Exceptions
 import ATrade.Quotes.Finam as QF

src/ATrade/Driver/Real/QuoteSourceThread.hs

@@ -6,7 +6,7 @@ module ATrade.Driver.Real.QuoteSourceThread
 ) where
 
 import           ATrade.BarAggregator
-import           ATrade.Driver.Real.Types
+import           ATrade.Driver.Types
 import           ATrade.QuoteSource.Client
 import           ATrade.RoboCom.Monad
 import           ATrade.RoboCom.Types

src/ATrade/Driver/Types.hs

@@ -1,6 +1,7 @@
 {-# LANGUAGE RankNTypes #-}
 
-module ATrade.Driver.Real.Types (
+module ATrade.Driver.Types
+(
   Strategy(..),
   StrategyInstanceParams(..),
   InitializationCallback