From 80713c94eae9f2b15f7eefb7f91a0ec5c97d577c Mon Sep 17 00:00:00 2001
From: Jonathan Zernik <yzernik@gmail.com>
Date: Fri, 31 Jul 2020 03:06:10 -0700
Subject: [PATCH] Use network config from config file to set paramas (#182)

---
 itests/config.ini           |  8 +++-----
 itests/tests/conftest.py    |  4 ++--
 squeakserver/server/main.py | 13 +++++++++----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/itests/config.ini b/itests/config.ini
index 6f2239f4..279f55a6 100644
--- a/itests/config.ini
+++ b/itests/config.ini
@@ -1,5 +1,7 @@
-[DEFAULT]
+[squeaknode]
 network=simnet
+price=1000
+max_squeaks_per_address_per_hour=5
 
 [lnd]
 host=lnd
@@ -19,10 +21,6 @@ rpc_pass=devpass
 rpc_host=0.0.0.0
 rpc_port=8774
 
-[squeaknode]
-price=1000
-max_squeaks_per_address_per_hour=5
-
 [admin]
 rpc_host=0.0.0.0
 rpc_port=8994
diff --git a/itests/tests/conftest.py b/itests/tests/conftest.py
index b137e6c4..b43d3dfb 100644
--- a/itests/tests/conftest.py
+++ b/itests/tests/conftest.py
@@ -20,8 +20,8 @@ from tests.util import load_lightning_client
 
 @pytest.fixture(autouse=True)
 def select_mainnet_params():
-    # Set the network to mainnet.
-    SelectParams("mainnet")
+    # Set the network to simnet
+    SelectParams("simnet")
 
 @pytest.fixture
 def server_stub():
diff --git a/squeakserver/server/main.py b/squeakserver/server/main.py
index 6bcdf469..8d2452be 100644
--- a/squeakserver/server/main.py
+++ b/squeakserver/server/main.py
@@ -51,6 +51,10 @@ def load_admin_rpc_server(config, handler) -> SqueakAdminServerServicer:
     )
 
 
+def load_network(config):
+    return config["squeaknode"]["network"]
+
+
 def load_price(config):
     return int(config["squeaknode"]["price"])
 
@@ -134,10 +138,6 @@ def main():
 
 
 def run_server(config):
-    logger.info("network: " + config["DEFAULT"]["network"])
-    # SelectParams(config['DEFAULT']['network'])
-    SelectParams("mainnet")
-
     # load the db params
     db_params = load_db_params(config)
     logger.info("db params: " + str(db_params))
@@ -148,6 +148,11 @@ def run_server(config):
     postgres_db.get_version()
     postgres_db.init()
 
+    # load the price
+    network = load_network(config)
+    logger.info("network: " + network)
+    SelectParams(network)
+
     # load the price
     price = load_price(config)