From 19089facdc4c572c3e83c7ee9e01ae4078a20a5c Mon Sep 17 00:00:00 2001
From: Denis Tereshkin <denis@kasan.ws>
Date: Tue, 28 Jan 2020 20:00:14 +0700
Subject: [PATCH] Adjust to libatrade-0.9

---
 app/Main.hs          |  8 ++++++--
 app/Version.hs       | 16 +++++++---------
 quik-connector.cabal |  3 ++-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/Main.hs b/app/Main.hs
index 0210b1c..ff8e649 100644
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -37,7 +37,10 @@ import           System.ZMQ4.ZAP
 
 import           Data.Maybe
 import qualified Data.Text                                     as T
+import           Data.Version
 
+import           ATrade                                        (libatrade_gitrev,
+                                                                libatrade_version)
 import           Config
 import           TickTable                                     (mkTickTable)
 import           Version
@@ -72,7 +75,7 @@ initLogging = do
 main :: IO ()
 main = do
   initLogging
-  infoM "main" $ "Starting quik-connector-" ++ T.unpack quikConnectorVersionText
+  infoM "main" $ "Starting quik-connector-" ++ T.unpack quikConnectorVersionText ++ "; libatrade-" ++ showVersion libatrade_version ++ "(" ++ libatrade_gitrev ++ ")"
   infoM "main" "Loading config"
   config <- readConfig "quik-connector.config.json"
 
@@ -112,7 +115,7 @@ main = do
       bracket (forkIO $ pipeReaderThread ctx config c2) killThread (\_ -> do
         withZMQTradeSink ctx (tradeSink config) (\zmqTradeSink -> do
           withZMQTradeSink ctx (tradeSink2 config) (\zmqTradeSink2 -> do
-            bracket (startQuoteSourceServer c2 ctx (T.pack $ quotesourceEndpoint config) (Just "global")) stopQuoteSourceServer (\_ -> do
+            bracket (startQuoteSourceServer c2 ctx (T.pack $ quotesourceEndpoint config) quoteSourceServerSecurityParams) stopQuoteSourceServer (\_ -> do
               bracket (startBrokerServer [brokerP, brokerQ] ctx (T.pack $ brokerserverEndpoint config) [zmqTradeSink2, zmqTradeSink] serverParams) stopBrokerServer (\_ -> do
                 void $ Gtk.init Nothing
                 window <- new Gtk.Window [ #title := "Quik connector" ]
@@ -133,6 +136,7 @@ main = do
           infoM "main" $ "QS: " ++ qsep
           bracket (startPipeReader ctx (T.pack qsep) qsdataChan) stopPipeReader (\_ -> forever $ threadDelay 1000000)
         _ -> return ()
+    quoteSourceServerSecurityParams = defaultServerSecurityParams { sspDomain = Just "global" }
 
 
 loadCertificatesFromDirectory :: FilePath -> IO [CurveCertificate]
diff --git a/app/Version.hs b/app/Version.hs
index 9bee198..58d15f2 100644
--- a/app/Version.hs
+++ b/app/Version.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE QuasiQuotes #-}
 
 module Version
   (
@@ -6,15 +5,14 @@ module Version
     quikConnectorVersionText
   ) where
 
-import qualified Data.Text      as T
-import           Text.Printf.TH
+import qualified Data.Text            as T
+import           Data.Version
+import           Paths_quik_connector
 
-quikConnectorVersion :: (Int, Int, Int, Int)
-quikConnectorVersion = (0, 4, 0, 0)
+
+quikConnectorVersion :: Version
+quikConnectorVersion = version
 
 quikConnectorVersionText :: T.Text
-quikConnectorVersionText =
-  [st|%d.%d.%d.%d|] v1 v2 v3 v4
-  where
-    (v1, v2, v3, v4) = quikConnectorVersion
+quikConnectorVersionText = T.pack $ showVersion version
 
diff --git a/quik-connector.cabal b/quik-connector.cabal
index 4f7d4b6..e381815 100644
--- a/quik-connector.cabal
+++ b/quik-connector.cabal
@@ -49,7 +49,7 @@ library
                      , aeson
                      , cond
                      , scientific
-                     , libatrade >= 0.8 && < 0.9
+                     , libatrade >= 0.9 && < 0.10
                      , deepseq
                      , errors
                      , split
@@ -109,6 +109,7 @@ executable quik-connector-exe
   default-language:    Haskell2010
   other-modules:       Config
                      , Version
+                     , Paths_quik_connector
 -- extra-libraries:     "user32"
 
 test-suite quik-connector-test