Changes e2e teos config file format and updates circleci conf

.circleci/config.yml

@@ -73,10 +73,10 @@ jobs:
           name: Setup teos
           command: |
             . venv/bin/activate
-            cp test/teos/e2e/teos-conf.py teos/conf.py
             python3 -m generate_keys -d ~/.teos/
             python3 -m generate_keys -n cli -d ~/.teos_cli/
             cp ~/.teos/teos_pk.der ~/.teos_cli/
+            cp test/teos/e2e/teos.conf ~/.teos/
 
 
       # Run E2E tests

test/teos/e2e/teos-conf.py

@@ -1,26 +0,0 @@
-# bitcoind
-BTC_RPC_USER = "user"
-BTC_RPC_PASSWD = "passwd"
-BTC_RPC_HOST = "localhost"
-BTC_RPC_PORT = 18445
-BTC_NETWORK = "regtest"
-
-# ZMQ
-FEED_PROTOCOL = "tcp"
-FEED_ADDR = "127.0.0.1"
-FEED_PORT = 28335
-
-# TEOS
-DATA_FOLDER = "~/.teos/"
-MAX_APPOINTMENTS = 100
-EXPIRY_DELTA = 6
-MIN_TO_SELF_DELAY = 20
-SERVER_LOG_FILE = "teos.log"
-TEOS_SECRET_KEY = "teos_sk.der"
-
-# CHAIN MONITOR
-POLLING_DELTA = 60
-BLOCK_WINDOW_SIZE = 10
-
-# LEVELDB
-DB_PATH = "appointments"

test/teos/e2e/teos.conf

@@ -0,0 +1,20 @@
+[bitcoind]
+btc_rpc_user = user
+btc_rpc_passwd = passwd
+btc_rpc_connect = localhost
+btc_rpc_port = 18445
+btc_network = regtest
+
+# [zmq]
+feed_protocol = tcp
+feed_connect = 127.0.0.1
+feed_port = 28335
+
+[teos]
+max_appointments = 100
+expiry_delta = 6
+min_to_self_delay = 20
+
+# [chain monitor]
+polling_delta = 60
+block_window_size = 10