From 10da7d2a10529651412ffbc50ff68041a52be9a4 Mon Sep 17 00:00:00 2001 From: Sergi Delgado Segura Date: Tue, 9 Jun 2020 09:24:00 +0200 Subject: [PATCH] teos - feed_* -> btc_feed_* --- docker/entrypoint.sh | 8 ++++++++ teos/__init__.py | 6 +++--- teos/chain_monitor.py | 6 +++--- teos/template.conf | 6 +++--- teos/teosd.py | 11 ++++++++++- test/teos/e2e/teos.conf | 6 +++--- test/teos/unit/conftest.py | 2 +- 7 files changed, 31 insertions(+), 14 deletions(-) diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 7085097..f02f89b 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -30,4 +30,12 @@ if [[ ! -z ${BTC_RPC_PORT} ]]; then START_COMMAND=$START_COMMAND" --btcrpcport=""$BTC_RPC_PORT" fi +if [[ ! -z ${BTC_FEED_CONNECT} ]]; then + START_COMMAND=$START_COMMAND" --btcfeedconnect=""$BTC_FEED_CONNECT" +fi + +if [[ ! -z ${BTC_FEED_PORT} ]]; then + START_COMMAND=$START_COMMAND" --btcfeedport=""$BTC_FEED_PORT" +fi + $START_COMMAND diff --git a/teos/__init__.py b/teos/__init__.py index 1a29ddb..96a474a 100644 --- a/teos/__init__.py +++ b/teos/__init__.py @@ -13,9 +13,9 @@ DEFAULT_CONF = { "BTC_RPC_CONNECT": {"value": "127.0.0.1", "type": str}, "BTC_RPC_PORT": {"value": 8332, "type": int}, "BTC_NETWORK": {"value": "mainnet", "type": str}, - "FEED_PROTOCOL": {"value": "tcp", "type": str}, - "FEED_CONNECT": {"value": "127.0.0.1", "type": str}, - "FEED_PORT": {"value": 28332, "type": int}, + "BTC_FEED_PROTOCOL": {"value": "tcp", "type": str}, + "BTC_FEED_CONNECT": {"value": "localhost", "type": str}, + "BTC_FEED_PORT": {"value": 28332, "type": int}, "MAX_APPOINTMENTS": {"value": 1000000, "type": int}, "DEFAULT_SLOTS": {"value": 100, "type": int}, "DEFAULT_SUBSCRIPTION_DURATION": {"value": 4320, "type": int}, diff --git a/teos/chain_monitor.py b/teos/chain_monitor.py index 6f1522d..e61dd31 100644 --- a/teos/chain_monitor.py +++ b/teos/chain_monitor.py @@ -54,9 +54,9 @@ class ChainMonitor: self.zmqSubSocket.connect( "%s://%s:%s" % ( - bitcoind_feed_params.get("FEED_PROTOCOL"), - bitcoind_feed_params.get("FEED_CONNECT"), - bitcoind_feed_params.get("FEED_PORT"), + bitcoind_feed_params.get("BTC_FEED_PROTOCOL"), + bitcoind_feed_params.get("BTC_FEED_CONNECT"), + bitcoind_feed_params.get("BTC_FEED_PORT"), ) ) diff --git a/teos/template.conf b/teos/template.conf index 836fa76..03d4735 100644 --- a/teos/template.conf +++ b/teos/template.conf @@ -6,9 +6,9 @@ btc_rpc_port = 8332 btc_network = mainnet # [zmq] -feed_protocol = tcp -feed_connect = 127.0.0.1 -feed_port = 28332 +btc_feed_protocol = tcp +btc_feed_connect = localhost +btc_feed_port = 28332 [teos] api_bind = localhost diff --git a/teos/teosd.py b/teos/teosd.py index 8e1a694..5d68efa 100644 --- a/teos/teosd.py +++ b/teos/teosd.py @@ -52,7 +52,7 @@ def main(command_line_conf): logger.info("Starting TEOS") bitcoind_connect_params = {k: v for k, v in config.items() if k.startswith("BTC")} - bitcoind_feed_params = {k: v for k, v in config.items() if k.startswith("FEED")} + bitcoind_feed_params = {k: v for k, v in config.items() if k.startswith("BTC_FEED")} if not can_connect_to_bitcoind(bitcoind_connect_params): logger.error("Cannot connect to bitcoind. Shutting down") @@ -180,6 +180,8 @@ if __name__ == "__main__": "btcrpcpassword=", "btcrpcconnect=", "btcrpcport=", + "btcfeedconnect=", + "btcfeedport=", "datadir=", "help", ], @@ -205,6 +207,13 @@ if __name__ == "__main__": command_line_conf["BTC_RPC_PORT"] = int(arg) except ValueError: exit("btcrpcport must be an integer") + if opt in ["--btcfeedconnect"]: + command_line_conf["BTC_FEED_CONNECT"] = arg + if opt in ["--btcfeedport"]: + try: + command_line_conf["BTC_FEED_PORT"] = int(arg) + except ValueError: + exit("btcfeedport must be an integer") if opt in ["--datadir"]: command_line_conf["DATA_DIR"] = os.path.expanduser(arg) if opt in ["-h", "--help"]: diff --git a/test/teos/e2e/teos.conf b/test/teos/e2e/teos.conf index 6b6fd33..bbc0d99 100644 --- a/test/teos/e2e/teos.conf +++ b/test/teos/e2e/teos.conf @@ -6,9 +6,9 @@ btc_rpc_port = 18445 btc_network = regtest # [zmq] -feed_protocol = tcp -feed_connect = 127.0.0.1 -feed_port = 28335 +btc_feed_protocol = tcp +btc_feed_connect = 127.0.0.1 +btc_feed_port = 28335 [teos] max_appointments = 100 diff --git a/test/teos/unit/conftest.py b/test/teos/unit/conftest.py index f49bbb3..06d5cf7 100644 --- a/test/teos/unit/conftest.py +++ b/test/teos/unit/conftest.py @@ -29,7 +29,7 @@ DEFAULT_CONF["BTC_RPC_PORT"]["value"] = 18443 DEFAULT_CONF["BTC_NETWORK"]["value"] = "regtest" bitcoind_connect_params = {k: v["value"] for k, v in DEFAULT_CONF.items() if k.startswith("BTC")} -bitcoind_feed_params = {k: v["value"] for k, v in DEFAULT_CONF.items() if k.startswith("FEED")} +bitcoind_feed_params = {k: v["value"] for k, v in DEFAULT_CONF.items() if k.startswith("BTC_FEED")} @pytest.fixture(scope="session")