From 5e7cf812aae9041ee08ff68d927345453bcc44b7 Mon Sep 17 00:00:00 2001 From: Cryptoval Trading Technologies Date: Fri, 24 Jan 2025 04:23:56 +0000 Subject: [PATCH] using env for CONFIG_SERVICE --- data/admin/docker_images.cfg | 1 + data/apps/__DEPRECATED__/executor_app.cfg | 5 ++- data/apps/__DEPRECATED__/md_recorder_old.cfg | 3 +- data/apps/__DEPRECATED__/quant_app.cfg | 5 ++- data/apps/__DEPRECATED__/risk_manager_app.cfg | 5 ++- data/apps/__DEPRECATED__/trader_app.cfg | 5 ++- data/apps/algo_trade.cfg | 7 ++-- data/apps/common/__OLD__strategies .cfg | 32 +++++++++++++++++++ data/apps/common/hist_md_loaders.cfg | 6 ++++ data/apps/common/strategies.cfg | 6 ++-- data/apps/cvtt.cfg | 7 ++-- data/apps/cvtt_crypto_coinbs.cfg | 9 +++--- data/apps/cvtt_eqt_alpaca.cfg | 11 +++---- data/apps/md_portal.cfg | 6 ++-- data/apps/md_recorder.cfg | 8 ++--- data/apps/minimal_md.cfg | 3 +- data/apps/minimal_md_eqt.cfg | 3 +- data/apps/research/cointegration_trader.cfg | 7 ++-- data/apps/research/mkt_sim_client.cfg | 7 ++-- data/apps/research/mkt_simulator_crypto.cfg | 7 ++-- data/apps/research/mkt_simulator_eqt.cfg | 8 ++--- data/apps/tests/cancel_all_orders.cfg | 4 +-- data/apps/tests/cancel_order.cfg | 4 +-- data/apps/tests/get_open_orders.cfg | 4 +-- data/apps/tests/get_positions.cfg | 5 ++- data/apps/tests/get_trades.cfg | 3 +- data/apps/tests/listen_market_data.cfg | 7 ++-- data/apps/tests/listen_market_data_prod.cfg | 7 ++-- data/apps/tests/send_order.cfg | 4 +-- data/apps/tests/send_order_cvtt.cfg | 5 ++- data/refdata/refdata.cfg | 9 +++--- 31 files changed, 104 insertions(+), 99 deletions(-) create mode 100644 data/apps/common/__OLD__strategies .cfg create mode 100644 data/apps/common/hist_md_loaders.cfg diff --git a/data/admin/docker_images.cfg b/data/admin/docker_images.cfg index d62d147..28006d6 100644 --- a/data/admin/docker_images.cfg +++ b/data/admin/docker_images.cfg @@ -4,6 +4,7 @@ "docker_dev_path": "market_data/alpaca_hbar", "based_on_project": "cvtt-rust" # "additional_projects": [] + # "test_script": "alpacka_hbar_test.sh" } , "Alpaca QAT Loader": { "image_name": "alpaca_qat", diff --git a/data/apps/__DEPRECATED__/executor_app.cfg b/data/apps/__DEPRECATED__/executor_app.cfg index f7cade9..9aaaec8 100644 --- a/data/apps/__DEPRECATED__/executor_app.cfg +++ b/data/apps/__DEPRECATED__/executor_app.cfg @@ -1,7 +1,6 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { - "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm + "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm , "exchanges_settings": { "COINBASE_AT": { "order_entry": { diff --git a/data/apps/__DEPRECATED__/md_recorder_old.cfg b/data/apps/__DEPRECATED__/md_recorder_old.cfg index a2836f9..c4942fe 100644 --- a/data/apps/__DEPRECATED__/md_recorder_old.cfg +++ b/data/apps/__DEPRECATED__/md_recorder_old.cfg @@ -1,5 +1,4 @@ @var WINDOW_SIZE_SEC=2592000 # 30 days -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { "md_recorder": { "db": { @@ -68,7 +67,7 @@ } # ---------------------------------- - , "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata + , "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata , "exchanges_settings": { "COINBASE_AT": { "order_entry": { diff --git a/data/apps/__DEPRECATED__/quant_app.cfg b/data/apps/__DEPRECATED__/quant_app.cfg index 3edc1bb..c5ca944 100644 --- a/data/apps/__DEPRECATED__/quant_app.cfg +++ b/data/apps/__DEPRECATED__/quant_app.cfg @@ -1,8 +1,7 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { - "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm + "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm , "quant": { "books": { "CVTT_BK01": {} diff --git a/data/apps/__DEPRECATED__/risk_manager_app.cfg b/data/apps/__DEPRECATED__/risk_manager_app.cfg index 7c9c665..a55e4ff 100644 --- a/data/apps/__DEPRECATED__/risk_manager_app.cfg +++ b/data/apps/__DEPRECATED__/risk_manager_app.cfg @@ -1,7 +1,6 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { - "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm + "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm , "risk_manager": { "book": "CVTT_BK01" , "database": { diff --git a/data/apps/__DEPRECATED__/trader_app.cfg b/data/apps/__DEPRECATED__/trader_app.cfg index cd6d6f8..7acb987 100644 --- a/data/apps/__DEPRECATED__/trader_app.cfg +++ b/data/apps/__DEPRECATED__/trader_app.cfg @@ -1,7 +1,6 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { - "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm + "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm , "exchanges_settings": { "COINBASE_AT": { "mkt_data": { diff --git a/data/apps/algo_trade.cfg b/data/apps/algo_trade.cfg index 9b109b1..c45865d 100644 --- a/data/apps/algo_trade.cfg +++ b/data/apps/algo_trade.cfg @@ -1,10 +1,9 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 @var ResultPath=/tmp @var SourcePath=/home/oleg/develop/cvtt2/tmp { - "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm - , "algos": @inc=http://${CONFIG_SERVICE}/apps/common/algos + "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm + , "algos": @inc=http://@env{CONFIG_SERVICE}/apps/common/algos , "session_type": "CALENDAR" , "calendar_session": { diff --git a/data/apps/common/__OLD__strategies .cfg b/data/apps/common/__OLD__strategies .cfg new file mode 100644 index 0000000..a66d558 --- /dev/null +++ b/data/apps/common/__OLD__strategies .cfg @@ -0,0 +1,32 @@ +{ + "CVTT_QST001": { + "class": "cvttpy.trading.strategies.test_strat.SeesawTestStrategy" + , "params": { + "dummy": "dummy" + } + } + , "VWAP001": { + "class": "cvttpy.trading.strategies.vwap_strat.VWAP001" + , "params": { + "vwap_interval": "1 hour" + , "hist_md_source": { + "loader_class": "cvttpy.research.time_series.loaders.tsdb_loader.TsMdLoader" + , "credentials_key": "TSDB_MD_CVTTDATA_RO" + , "interval": "2 hours" + #, "from_time" is calculated + } + } + } + , "DAILY_STOCK_001": { + "class": "cvttpy.trading.strategies.daily_stocks_strat.DailyStocksStrategy" + , "params": { + "liquidate_at": "15:45" # EDT Time + } + } + , "MAN-TPOS-BY-REDIS": { + "class": "cvttpy.trading.strategies.manual_strat.TgtPosByRedisStrategy" + , "params": { + "redis_subject": "MAN_TGT_POS" + } + } +} diff --git a/data/apps/common/hist_md_loaders.cfg b/data/apps/common/hist_md_loaders.cfg new file mode 100644 index 0000000..4dbc484 --- /dev/null +++ b/data/apps/common/hist_md_loaders.cfg @@ -0,0 +1,6 @@ +{ + "TimescaleMktDataLoader" : { + "loader_class": "cvttpy.research.time_series.loaders.tsdb_loader.TsMdLoader", + "credentials_key": "TSDB_MD_CVTTDATA_RO" + } +} \ No newline at end of file diff --git a/data/apps/common/strategies.cfg b/data/apps/common/strategies.cfg index a66d558..8a4f8a5 100644 --- a/data/apps/common/strategies.cfg +++ b/data/apps/common/strategies.cfg @@ -1,4 +1,5 @@ { + "hist_md_loaders": @inc=http:://@env{CONFIG_SERVER}/apps/common/hist_md_loaders "CVTT_QST001": { "class": "cvttpy.trading.strategies.test_strat.SeesawTestStrategy" , "params": { @@ -7,11 +8,10 @@ } , "VWAP001": { "class": "cvttpy.trading.strategies.vwap_strat.VWAP001" - , "params": { + , "default_params": { "vwap_interval": "1 hour" , "hist_md_source": { - "loader_class": "cvttpy.research.time_series.loaders.tsdb_loader.TsMdLoader" - , "credentials_key": "TSDB_MD_CVTTDATA_RO" + "loader": "TimescaleMktDataLoader" , "interval": "2 hours" #, "from_time" is calculated } diff --git a/data/apps/cvtt.cfg b/data/apps/cvtt.cfg index 1c46dd1..cce9932 100644 --- a/data/apps/cvtt.cfg +++ b/data/apps/cvtt.cfg @@ -1,9 +1,8 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 @var ResultPath=/tmp { - "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm + "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm , "comm_settings": "/comm/pubsub/redis/cloud17" # , "cvttcomm": { # "type": "redis" @@ -180,7 +179,7 @@ # -------------------------------------------------------------------- , "quant": { "app_channel": "QUANT" - , "strategies": @inc=http://${CONFIG_SERVICE}/apps/common/strategies + , "strategies": @inc=http://@env{CONFIG_SERVICE}/apps/common/strategies , "exchanges_settings": { "COINBASE_AT": { "mkt_data": { diff --git a/data/apps/cvtt_crypto_coinbs.cfg b/data/apps/cvtt_crypto_coinbs.cfg index 5bce529..a3ebe70 100644 --- a/data/apps/cvtt_crypto_coinbs.cfg +++ b/data/apps/cvtt_crypto_coinbs.cfg @@ -1,9 +1,8 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 @var ResultPath=/tmp { - "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm + "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm , "comm_settings": "/comm/pubsub/redis/cloud17" # , "cvttcomm": { # "type": "redis" @@ -108,7 +107,7 @@ }, } } - , "algos": @inc=http://${CONFIG_SERVICE}/apps/common/algos + , "algos": @inc=http://@env{CONFIG_SERVICE}/apps/common/algos , "trading_pos_diff_pct_trigger": 10.0 , "trading_depth": { "BTC": 0.001 @@ -143,7 +142,7 @@ , "quant": { "app_channel": "QUANT" - , "strategies": @inc=http://${CONFIG_SERVICE}/apps/common/strategies + , "strategies": @inc=http://@env{CONFIG_SERVICE}/apps/common/strategies , "exchanges_settings": { "COINBASE_AT": { "mkt_data": { diff --git a/data/apps/cvtt_eqt_alpaca.cfg b/data/apps/cvtt_eqt_alpaca.cfg index 8e30a99..35e5d36 100644 --- a/data/apps/cvtt_eqt_alpaca.cfg +++ b/data/apps/cvtt_eqt_alpaca.cfg @@ -1,10 +1,9 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 @var ResultPath=/tmp { "___dummy___": null - , "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm - , "active_instruments": @inc=http://${CONFIG_SERVICE}/apps/active_instruments + , "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm + , "active_instruments": @inc=http://@env{CONFIG_SERVICE}/apps/active_instruments , "comm_settings": "/comm/pubsub/redis/cvtt-prod-eqty-01" , "session_type": "CALENDAR" , "calendar_session": { @@ -42,7 +41,7 @@ }, } } - , "algos": @inc=http://${CONFIG_SERVICE}/apps/common/algos + , "algos": @inc=http://@env{CONFIG_SERVICE}/apps/common/algos , "trading_pos_diff_pct_trigger": 10.0 , "trading_depth": { "USD": 1000.0, @@ -111,7 +110,7 @@ # -------------------------------------------------------------------- , "quant": { "app_channel": "QUANT" - , "strategies": @inc=http://${CONFIG_SERVICE}/apps/common/strategies + , "strategies": @inc=http://@env{CONFIG_SERVICE}/apps/common/strategies , "exchanges_settings": { "*": { "mkt_data": { diff --git a/data/apps/md_portal.cfg b/data/apps/md_portal.cfg index 3fb12d6..39040b9 100644 --- a/data/apps/md_portal.cfg +++ b/data/apps/md_portal.cfg @@ -1,7 +1,5 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 - { # ---------------------------------- - "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm + "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm } diff --git a/data/apps/md_recorder.cfg b/data/apps/md_recorder.cfg index c77a787..fdb48b3 100644 --- a/data/apps/md_recorder.cfg +++ b/data/apps/md_recorder.cfg @@ -1,12 +1,10 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 - { - "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm + "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm // ------------------------------------------------------------------------- // This is used only for dynamically loaded instrument lists (as for Alpaca) - , "active_instruments": @inc=http://${CONFIG_SERVICE}/apps/active_instruments + , "active_instruments": @inc=http://@env{CONFIG_SERVICE}/apps/active_instruments , "comm_settings": "/comm/pubsub/redis/cvtt-prod-eqty-01" # , "cvttcomm": { # "type": "redis" diff --git a/data/apps/minimal_md.cfg b/data/apps/minimal_md.cfg index e987d70..26827b7 100644 --- a/data/apps/minimal_md.cfg +++ b/data/apps/minimal_md.cfg @@ -1,6 +1,5 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { - "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata + "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata "exchanges_settings": { "*": { "mkt_data": { diff --git a/data/apps/minimal_md_eqt.cfg b/data/apps/minimal_md_eqt.cfg index d37fdd2..31881ad 100644 --- a/data/apps/minimal_md_eqt.cfg +++ b/data/apps/minimal_md_eqt.cfg @@ -1,6 +1,5 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { - "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata + "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata , "calendar_session": { "trading_hours_url": [ "GET" diff --git a/data/apps/research/cointegration_trader.cfg b/data/apps/research/cointegration_trader.cfg index 71a4909..32a3300 100644 --- a/data/apps/research/cointegration_trader.cfg +++ b/data/apps/research/cointegration_trader.cfg @@ -1,8 +1,7 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { - "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm - , "algos": @inc=http://${CONFIG_SERVICE}/apps/common/algos + "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm + , "algos": @inc=http://@env{CONFIG_SERVICE}/apps/common/algos , "exchanges_settings": { "ALPACA_SIM": { "mkt_data": { diff --git a/data/apps/research/mkt_sim_client.cfg b/data/apps/research/mkt_sim_client.cfg index 51a4524..c08addb 100644 --- a/data/apps/research/mkt_sim_client.cfg +++ b/data/apps/research/mkt_sim_client.cfg @@ -1,8 +1,7 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { - "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm - , "algos": @inc=http://${CONFIG_SERVICE}/apps/common/algos + "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm + , "algos": @inc=http://@env{CONFIG_SERVICE}/apps/common/algos "exchanges_settings": { "*": { "mkt_data": { diff --git a/data/apps/research/mkt_simulator_crypto.cfg b/data/apps/research/mkt_simulator_crypto.cfg index e25f7aa..6b6dab1 100644 --- a/data/apps/research/mkt_simulator_crypto.cfg +++ b/data/apps/research/mkt_simulator_crypto.cfg @@ -1,4 +1,3 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 @var SQLITE_DIR=/home/oleg/tmp/sqlite @var FROM_TIME="2024-11-14 13:30:00" @@ -6,9 +5,9 @@ # @var INTERVAL="5 minutes" { - "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm - , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm + "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm + , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm , "comm_settings": "/comm/pubsub/redis/localhost" , "simulation": { # "speed_factor": 1.0, diff --git a/data/apps/research/mkt_simulator_eqt.cfg b/data/apps/research/mkt_simulator_eqt.cfg index e036a24..b3bf492 100644 --- a/data/apps/research/mkt_simulator_eqt.cfg +++ b/data/apps/research/mkt_simulator_eqt.cfg @@ -1,5 +1,3 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 - @var DATA_DIR=/home/coder/project/data @var MD_WS_PORT=10180 @@ -12,9 +10,9 @@ @var TO_TIME=20:00 { - "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm - , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm + "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm + , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm , "comm_settings": "/comm/pubsub/redis/localhost" , "simulation": { "speed_factor": 0.0, diff --git a/data/apps/tests/cancel_all_orders.cfg b/data/apps/tests/cancel_all_orders.cfg index 2af1b00..544a498 100644 --- a/data/apps/tests/cancel_all_orders.cfg +++ b/data/apps/tests/cancel_all_orders.cfg @@ -1,5 +1,3 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 - { "__DUMMY__": null @@ -24,6 +22,6 @@ } } } - , "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata + , "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata } diff --git a/data/apps/tests/cancel_order.cfg b/data/apps/tests/cancel_order.cfg index 2af1b00..544a498 100644 --- a/data/apps/tests/cancel_order.cfg +++ b/data/apps/tests/cancel_order.cfg @@ -1,5 +1,3 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 - { "__DUMMY__": null @@ -24,6 +22,6 @@ } } } - , "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata + , "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata } diff --git a/data/apps/tests/get_open_orders.cfg b/data/apps/tests/get_open_orders.cfg index 59ded74..d60c25b 100644 --- a/data/apps/tests/get_open_orders.cfg +++ b/data/apps/tests/get_open_orders.cfg @@ -1,5 +1,3 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 - { "__DUMMY__": null @@ -29,6 +27,6 @@ } } } - , "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata + , "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata } diff --git a/data/apps/tests/get_positions.cfg b/data/apps/tests/get_positions.cfg index 8c3dae1..b943b9b 100644 --- a/data/apps/tests/get_positions.cfg +++ b/data/apps/tests/get_positions.cfg @@ -1,4 +1,3 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { "__DUMMY__": null @@ -40,7 +39,7 @@ } } } - , "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm + , "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm } diff --git a/data/apps/tests/get_trades.cfg b/data/apps/tests/get_trades.cfg index e39a71f..b6addf8 100644 --- a/data/apps/tests/get_trades.cfg +++ b/data/apps/tests/get_trades.cfg @@ -1,4 +1,3 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { "__DUMMY__": null @@ -31,6 +30,6 @@ } } } - , "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata + , "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata } diff --git a/data/apps/tests/listen_market_data.cfg b/data/apps/tests/listen_market_data.cfg index 471fb15..e9bed5e 100644 --- a/data/apps/tests/listen_market_data.cfg +++ b/data/apps/tests/listen_market_data.cfg @@ -1,8 +1,7 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { - "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm - , "active_instruments": @inc=http://${CONFIG_SERVICE}/apps/active_instruments + "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm + , "active_instruments": @inc=http://@env{CONFIG_SERVICE}/apps/active_instruments "exchanges_settings": { "*": { "mkt_data": { diff --git a/data/apps/tests/listen_market_data_prod.cfg b/data/apps/tests/listen_market_data_prod.cfg index ffcc4a7..7a993c1 100644 --- a/data/apps/tests/listen_market_data_prod.cfg +++ b/data/apps/tests/listen_market_data_prod.cfg @@ -1,8 +1,7 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { - "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm - , "active_instruments": @inc=http://${CONFIG_SERVICE}/apps/active_instruments + "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm + , "active_instruments": @inc=http://@env{CONFIG_SERVICE}/apps/active_instruments , "exchanges_settings": { "*": { "mkt_data": { diff --git a/data/apps/tests/send_order.cfg b/data/apps/tests/send_order.cfg index a917d98..b8095d8 100644 --- a/data/apps/tests/send_order.cfg +++ b/data/apps/tests/send_order.cfg @@ -1,5 +1,3 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 - { "__DUMMY__": null @@ -23,6 +21,6 @@ } } } - , "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata + , "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata } diff --git a/data/apps/tests/send_order_cvtt.cfg b/data/apps/tests/send_order_cvtt.cfg index 6047d93..9ffd612 100644 --- a/data/apps/tests/send_order_cvtt.cfg +++ b/data/apps/tests/send_order_cvtt.cfg @@ -1,7 +1,6 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { - "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm + "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm , "comm_settings": "/comm/pubsub/redis/cvtt-prod" # , "cvttcomm": { diff --git a/data/refdata/refdata.cfg b/data/refdata/refdata.cfg index 89f5633..e8dfc64 100644 --- a/data/refdata/refdata.cfg +++ b/data/refdata/refdata.cfg @@ -1,8 +1,7 @@ -@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { - "assets": @inc=http://${CONFIG_SERVICE}/refdata/assets - , "instruments": @inc=http://${CONFIG_SERVICE}/refdata/instruments - , "exchanges": @inc=http://${CONFIG_SERVICE}/refdata/exchanges - , "exchange_instruments": @inc=http://${CONFIG_SERVICE}/refdata/exchange_instruments + "assets": @inc=http://@env{CONFIG_SERVICE}/refdata/assets + , "instruments": @inc=http://@env{CONFIG_SERVICE}/refdata/instruments + , "exchanges": @inc=http://@env{CONFIG_SERVICE}/refdata/exchanges + , "exchange_instruments": @inc=http://@env{CONFIG_SERVICE}/refdata/exchange_instruments , "dynamic_instrument_exchanges": ["ALPACA"] }