Refactor: Move DEFAULT_CHAIN from AVAILABLE_CHAINS.json to env variable

jtimon · jtimon · commit e110ed5e63ef · 2018-08-02T23:38:38.000+02:00
diff --git a/docker/dev/conf/AVAILABLE_CHAINS.json b/docker/dev/conf/AVAILABLE_CHAINS.json
@@ -1,6 +1,4 @@
 {
-    "DEFAULT_CHAIN": "elementsregtest",
-
     "elementsregtest": {
         "proc": {
             "block_gen": [
diff --git a/docker/dev/conf/explorer.env b/docker/dev/conf/explorer.env
@@ -17,6 +17,8 @@ DB_BACKEND_ADR=postgres:5432
 ORM_MODEL=/build_docker/explorer/domain/db_domain.py
 ORM_SCHEMA=/build_docker/target/schema.json
 
+DEFAULT_CHAIN=elementsregtest
+
 REGTEST_ADR=bitcoin:18535
 REGTEST_ZMQ=tcp://bitcoin:18537
 REGTEST_RPCUSER=user18535
diff --git a/docker/production/conf/AVAILABLE_CHAINS.json b/docker/production/conf/AVAILABLE_CHAINS.json
@@ -1,6 +1,4 @@
 {
-    "DEFAULT_CHAIN": "elementsregtest",
-
     "elementsregtest": {
         "proc": {
             "block_gen": [
diff --git a/docker/production/conf/explorer.env b/docker/production/conf/explorer.env
@@ -17,6 +17,8 @@ DB_BACKEND_ADR=postgres:5432
 ORM_MODEL=/build_docker/explorer/domain/db_domain.py
 ORM_SCHEMA=/build_docker/target/schema.json
 
+DEFAULT_CHAIN=elementsregtest
+
 ELEMENTSREGTEST_ADR=elements:7041
 ELEMENTSREGTEST_ZMQ=tcp://elements:7043
 ELEMENTSREGTEST_RPCUSER=user7041
diff --git a/docker/staging/conf/AVAILABLE_CHAINS.json b/docker/staging/conf/AVAILABLE_CHAINS.json
@@ -1,6 +1,4 @@
 {
-    "DEFAULT_CHAIN": "bitcoin",
-
     "bitcoin": {
         "proc": {
             "greedy_cacher": [
diff --git a/docker/staging/conf/explorer.env b/docker/staging/conf/explorer.env
@@ -17,6 +17,8 @@ DB_BACKEND_ADR=postgres:5432
 ORM_MODEL=/build_docker/explorer/domain/db_domain.py
 ORM_SCHEMA=/build_docker/target/schema.json
 
+DEFAULT_CHAIN=bitcoin
+
 BITCOIN_ADR=bitcoin:8532
 BITCOIN_ZMQ=tcp://bitcoin:8534
 BITCOIN_RPCUSER=user8532
diff --git a/docker/test-postgres/conf/AVAILABLE_CHAINS.json b/docker/test-postgres/conf/AVAILABLE_CHAINS.json
@@ -1,6 +1,4 @@
 {
-    "DEFAULT_CHAIN": "elementsregtest",
-
     "elementsregtest": {
         "proc": {
             "block_gen": [
diff --git a/docker/test-postgres/conf/explorer.env b/docker/test-postgres/conf/explorer.env
@@ -17,6 +17,8 @@ DB_BACKEND_ADR=postgres:5432
 ORM_MODEL=/build_docker/explorer/domain/db_domain.py
 ORM_SCHEMA=/build_docker/target/schema.json
 
+DEFAULT_CHAIN=elementsregtest
+
 REGTEST_ADR=bitcoin:18535
 REGTEST_ZMQ=tcp://bitcoin:18537
 REGTEST_RPCUSER=user18535
diff --git a/explorer/domain/api_domain.py b/explorer/domain/api_domain.py
@@ -19,13 +19,11 @@
 from explorer.resources.rpccaller import RpcCallerResource
 
 def get_default_chain(**kwargs):
-    return env_config.AVAILABLE_CHAINS['DEFAULT_CHAIN']
+    return env_config.DEFAULT_CHAIN
 
 def get_available_chains(**kwargs):
     available_chains = {}
     for k, v in env_config.AVAILABLE_CHAINS.iteritems():
-        if k == 'DEFAULT_CHAIN':
-            continue
         available_chains[k] = v['properties']
     return available_chains, 200
 
diff --git a/explorer/env_config.py b/explorer/env_config.py
@@ -6,6 +6,8 @@
 
 from explorer.services.rpcdaemon import RpcCaller
 
+DEFAULT_CHAIN = os.environ.get('DEFAULT_CHAIN')
+
 file = open('/build_docker/docker/conf/AVAILABLE_CHAINS.json', 'r').read()
 AVAILABLE_CHAINS = json.loads(file)
 
diff --git a/explorer/resources/chain.py b/explorer/resources/chain.py
@@ -16,7 +16,7 @@ def update_chain(self, request_data):
             self.chain = request_data['chain']
             del request_data['chain']
         else:
-            self.chain = env_config.AVAILABLE_CHAINS['DEFAULT_CHAIN']
+            self.chain = env_config.DEFAULT_CHAIN
         if not self.chain in env_config.AVAILABLE_CHAINS:
             raise UnknownChainError
 
diff --git a/explorer/test_tools/test_prototypes.py b/explorer/test_tools/test_prototypes.py
@@ -40,8 +40,6 @@ def do_101(self, chain):
     
     def run_tests(self):
         for chain, chain_properties in env_config.AVAILABLE_CHAINS.items():
-            if chain == 'DEFAULT_CHAIN':
-                continue
             print('Running %s for chain %s' % (self.__class__.__name__, chain))
             self.init_chrono()
             self.run_tests_for_chain(chain)

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`	`1`	`{`
`2`		`- "DEFAULT_CHAIN": "elementsregtest",`
`3`		`-`
`4`	`2`	`"elementsregtest": {`
`5`	`3`	`"proc": {`
`6`	`4`	`"block_gen": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`	`1`	`{`
`2`		`- "DEFAULT_CHAIN": "bitcoin",`
`3`		`-`
`4`	`2`	`"bitcoin": {`
`5`	`3`	`"proc": {`
`6`	`4`	`"greedy_cacher": [`