From 6c12329d86264811022fa9d549dd71e91ce3e37a Mon Sep 17 00:00:00 2001
From: Denis Tereshkin <denis@kasan.ws>
Date: Wed, 28 Aug 2019 15:07:55 +0700
Subject: [PATCH] Moved Driver.Real.Types to Driver.Types

---
 robocom-zero.cabal                          | 2 +-
 src/ATrade/Driver/Backtest.hs               | 9 ++++-----
 src/ATrade/Driver/Real.hs                   | 2 +-
 src/ATrade/Driver/Real/QuoteSourceThread.hs | 2 +-
 src/ATrade/Driver/{Real => }/Types.hs       | 3 ++-
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename src/ATrade/Driver/{Real => }/Types.hs (98%)

diff --git a/robocom-zero.cabal b/robocom-zero.cabal
index 9496e51..3945aab 100644
--- a/robocom-zero.cabal
+++ b/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
diff --git a/src/ATrade/Driver/Backtest.hs b/src/ATrade/Driver/Backtest.hs
index bbd99fc..b88d08c 100644
--- a/src/ATrade/Driver/Backtest.hs
+++ b/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)
+                                           appendToLog, runStrategyElement, st)
 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
diff --git a/src/ATrade/Driver/Real.hs b/src/ATrade/Driver/Real.hs
index 8a312ba..9a667db 100644
--- a/src/ATrade/Driver/Real.hs
+++ b/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
diff --git a/src/ATrade/Driver/Real/QuoteSourceThread.hs b/src/ATrade/Driver/Real/QuoteSourceThread.hs
index e5d3b1a..51891df 100644
--- a/src/ATrade/Driver/Real/QuoteSourceThread.hs
+++ b/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
diff --git a/src/ATrade/Driver/Real/Types.hs b/src/ATrade/Driver/Types.hs
similarity index 98%
rename from src/ATrade/Driver/Real/Types.hs
rename to src/ATrade/Driver/Types.hs
index 0728fa8..ce247f6 100644
--- a/src/ATrade/Driver/Real/Types.hs
+++ b/src/ATrade/Driver/Types.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE RankNTypes #-}
 
-module ATrade.Driver.Real.Types (
+module ATrade.Driver.Types
+(
   Strategy(..),
   StrategyInstanceParams(..),
   InitializationCallback