From 00a48ce6f54d1427a192cfe811391b36d2f71edd Mon Sep 17 00:00:00 2001
From: Sergi Delgado Segura <sergi.delgado.s@gmail.com>
Date: Sat, 21 Mar 2020 21:57:17 +0100
Subject: [PATCH] Modifies ConfigParser so config file is passed as parameter
 (to be used by both teos and cli)

- Modifies ConfigParser
- Adapts __init__ and teosd at teos/
---
 cli/conf.py                | 14 --------------
 common/config_loader.py    |  4 ++--
 teos/__init__.py           |  1 +
 teos/teosd.py              |  4 ++--
 test/teos/unit/conftest.py |  2 +-
 5 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 cli/conf.py

diff --git a/cli/conf.py b/cli/conf.py
deleted file mode 100644
index 1072da7..0000000
--- a/cli/conf.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# TEOS-SERVER
-DEFAULT_TEOS_API_SERVER = "http://localhost"
-DEFAULT_TEOS_API_PORT = 9814
-
-# WT-CLI
-DATA_FOLDER = "~/.teos_cli/"
-
-CLIENT_LOG_FILE = "cli.log"
-APPOINTMENTS_FOLDER_NAME = "appointment_receipts"
-
-# KEYS
-TEOS_PUBLIC_KEY = "teos_pk.der"
-CLI_PRIVATE_KEY = "cli_sk.der"
-CLI_PUBLIC_KEY = "cli_pk.der"
diff --git a/common/config_loader.py b/common/config_loader.py
index e088a83..9a9d82f 100644
--- a/common/config_loader.py
+++ b/common/config_loader.py
@@ -28,9 +28,9 @@ class ConfigLoader:
             ones in default / config file.
     """
 
-    def __init__(self, data_dir, default_conf, command_line_conf):
+    def __init__(self, data_dir, conf_file_name, default_conf, command_line_conf):
         self.data_dir = data_dir
-        self.conf_file_path = self.data_dir + "teos.conf"
+        self.conf_file_path = self.data_dir + conf_file_name
         self.conf_fields = default_conf
         self.command_line_conf = command_line_conf
 
diff --git a/teos/__init__.py b/teos/__init__.py
index 9a67e97..707c7ec 100644
--- a/teos/__init__.py
+++ b/teos/__init__.py
@@ -4,6 +4,7 @@ from teos.utils.auth_proxy import AuthServiceProxy
 HOST = "localhost"
 PORT = 9814
 DATA_DIR = os.path.expanduser("~/.teos/")
+CONF_FILE_NAME = "teos.conf"
 LOG_PREFIX = "teos"
 
 # Default conf fields
diff --git a/teos/teosd.py b/teos/teosd.py
index 2509d02..400a33f 100644
--- a/teos/teosd.py
+++ b/teos/teosd.py
@@ -9,7 +9,6 @@ from common.config_loader import ConfigLoader
 from common.cryptographer import Cryptographer
 from common.tools import setup_logging, setup_data_folder
 
-from teos import LOG_PREFIX, DATA_DIR, DEFAULT_CONF
 from teos.api import API
 from teos.watcher import Watcher
 from teos.builder import Builder
@@ -20,6 +19,7 @@ from teos.db_manager import DBManager
 from teos.chain_monitor import ChainMonitor
 from teos.block_processor import BlockProcessor
 from teos.tools import can_connect_to_bitcoind, in_correct_network
+from teos import LOG_PREFIX, DATA_DIR, DEFAULT_CONF, CONF_FILE_NAME
 
 logger = Logger(actor="Daemon", log_name_prefix=LOG_PREFIX)
 common.cryptographer.logger = Logger(actor="Cryptographer", log_name_prefix=LOG_PREFIX)
@@ -42,7 +42,7 @@ def main():
     signal(SIGQUIT, handle_signals)
 
     # Loads config and sets up the data folder and log file
-    config_loader = ConfigLoader(DATA_DIR, DEFAULT_CONF, command_line_conf)
+    config_loader = ConfigLoader(DATA_DIR, CONF_FILE_NAME, DEFAULT_CONF, command_line_conf)
     config = config_loader.build_config()
     setup_data_folder(DATA_DIR)
     setup_logging(config.get("LOG_FILE"), LOG_PREFIX)
diff --git a/test/teos/unit/conftest.py b/test/teos/unit/conftest.py
index ebdff6f..367d28e 100644
--- a/test/teos/unit/conftest.py
+++ b/test/teos/unit/conftest.py
@@ -169,7 +169,7 @@ def generate_dummy_tracker():
 
 
 def get_config():
-    config_loader = ConfigLoader(".", DEFAULT_CONF, {})
+    config_loader = ConfigLoader(".", "teos.conf", DEFAULT_CONF, {})
     config = config_loader.build_config()
 
     return config