From 245d5b49f32f870f44c8ef8a078e063bf6d2116e Mon Sep 17 00:00:00 2001
From: Sergi Delgado Segura <sergi.delgado.s@gmail.com>
Date: Thu, 23 Jan 2020 16:23:07 +0100
Subject: [PATCH] Updates config files

Removes unused values from pisa config file and adds cli config file
---
 .gitignore                 |  1 +
 apps/cli/sample_conf.py    | 13 +++++++++++++
 pisa/sample_conf.py        | 13 ++++---------
 test/pisa/e2e/pisa-conf.py | 13 ++++---------
 4 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 apps/cli/sample_conf.py

diff --git a/.gitignore b/.gitignore
index 978a651..8d7a2c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ test.py
 .coverage
 htmlcov
 docs/
+.pisa_btc
diff --git a/apps/cli/sample_conf.py b/apps/cli/sample_conf.py
new file mode 100644
index 0000000..d9f2b90
--- /dev/null
+++ b/apps/cli/sample_conf.py
@@ -0,0 +1,13 @@
+# PISA-SERVER
+DEFAULT_PISA_API_SERVER = "btc.pisa.watch"
+DEFAULT_PISA_API_PORT = 9814
+
+# PISA-CLI
+DATA_FOLDER = "~/.pisa_btc/"
+
+CLIENT_LOG_FILE = "pisa-cli.log"
+APPOINTMENTS_FOLDER_NAME = "appointment_receipts"
+
+CLI_PUBLIC_KEY = "cli_pk.der"
+CLI_PRIVATE_KEY = "cli_sk.der"
+PISA_PUBLIC_KEY = "pisa_pk.der"
diff --git a/pisa/sample_conf.py b/pisa/sample_conf.py
index 8d08590..3c219c1 100644
--- a/pisa/sample_conf.py
+++ b/pisa/sample_conf.py
@@ -5,27 +5,22 @@ BTC_RPC_HOST = "localhost"
 BTC_RPC_PORT = 18443
 BTC_NETWORK = "regtest"
 
-# CHAIN MONITOR
-POLLING_DELTA = 60
-BLOCK_WINDOW_SIZE = 10
-
 # ZMQ
 FEED_PROTOCOL = "tcp"
 FEED_ADDR = "127.0.0.1"
 FEED_PORT = 28332
 
 # PISA
+DATA_FOLDER = "~/.pisa_btc/"
 MAX_APPOINTMENTS = 100
 EXPIRY_DELTA = 6
 MIN_TO_SELF_DELAY = 20
 SERVER_LOG_FILE = "pisa.log"
 PISA_SECRET_KEY = "pisa_sk.der"
 
-# PISA-CLI
-CLIENT_LOG_FILE = "pisa.log"
-
-# TEST
-TEST_LOG_FILE = "test.log"
+# CHAIN MONITOR
+POLLING_DELTA = 60
+BLOCK_WINDOW_SIZE = 10
 
 # LEVELDB
 DB_PATH = "appointments"
diff --git a/test/pisa/e2e/pisa-conf.py b/test/pisa/e2e/pisa-conf.py
index 83fe719..f53a81b 100644
--- a/test/pisa/e2e/pisa-conf.py
+++ b/test/pisa/e2e/pisa-conf.py
@@ -5,27 +5,22 @@ BTC_RPC_HOST = "localhost"
 BTC_RPC_PORT = 18445
 BTC_NETWORK = "regtest"
 
-# CHAIN MONITOR
-POLLING_DELTA = 60
-BLOCK_WINDOW_SIZE = 10
-
 # ZMQ
 FEED_PROTOCOL = "tcp"
 FEED_ADDR = "127.0.0.1"
 FEED_PORT = 28335
 
 # PISA
+DATA_FOLDER = "~/.pisa_btc/"
 MAX_APPOINTMENTS = 100
 EXPIRY_DELTA = 6
 MIN_TO_SELF_DELAY = 20
 SERVER_LOG_FILE = "pisa.log"
 PISA_SECRET_KEY = "pisa_sk.der"
 
-# PISA-CLI
-CLIENT_LOG_FILE = "pisa.log"
-
-# TEST
-TEST_LOG_FILE = "test.log"
+# CHAIN MONITOR
+POLLING_DELTA = 60
+BLOCK_WINDOW_SIZE = 10
 
 # LEVELDB
 DB_PATH = "appointments"