From b86a52a8bc89b59f6936b7de47b0abdb4d6925ee Mon Sep 17 00:00:00 2001 From: Denis Tereshkin Date: Mon, 7 Jun 2021 19:41:19 +0700 Subject: [PATCH] Fix backtest driver --- src/ATrade/Driver/Backtest.hs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/ATrade/Driver/Backtest.hs b/src/ATrade/Driver/Backtest.hs index d924dd9..1c31d51 100644 --- a/src/ATrade/Driver/Backtest.hs +++ b/src/ATrade/Driver/Backtest.hs @@ -96,8 +96,8 @@ feedArgParser = eitherReader (\s -> case splitOn ":" s of [tid, fpath] -> Right $ Feed (T.pack tid) fpath _ -> Left $ "Unable to parse feed id: " ++ s) -backtestMain :: (FromJSON c, StateHasPositions s) => DiffTime -> s -> Maybe (InitializationCallback c) -> EventCallback c s -> IO () -backtestMain _dataDownloadDelta defaultState initCallback callback = do +backtestMain :: (FromJSON c, StateHasPositions s) => DiffTime -> s -> EventCallback c s -> IO () +backtestMain _dataDownloadDelta defaultState callback = do params <- execParser opts (tickerList, config) <- loadStrategyConfig params @@ -108,15 +108,11 @@ backtestMain _dataDownloadDelta defaultState initCallback callback = do tickers = tickerList, strategyQTISEp = Nothing } - updatedConfig <- case initCallback of - Just cb -> cb config instanceParams - Nothing -> return config - feeds <- loadFeeds (paramsFeeds params) bars <- makeBars (T.pack $ qtisEndpoint params) tickerList - runBacktestDriver feeds updatedConfig bars + runBacktestDriver feeds config bars where opts = info (helper <*> paramsParser) ( fullDesc <> header "ATrade strategy backtesting framework" )