From 86592b837abd58282182af97f3e1e86382210077 Mon Sep 17 00:00:00 2001
From: nolash <dev@holbrook.no>
Date: Wed, 29 Sep 2021 07:27:39 +0200
Subject: [PATCH] Move get state function to main module

---
 apps/util/initness/initness/__init__.py       |  1 +
 .../util/initness/initness/runnable/server.py | 33 ++-----------------
 apps/util/initness/initness/state.py          | 31 +++++++++++++++++
 3 files changed, 35 insertions(+), 30 deletions(-)
 create mode 100644 apps/util/initness/initness/state.py

diff --git a/apps/util/initness/initness/__init__.py b/apps/util/initness/initness/__init__.py
index e986168a..73b93053 100644
--- a/apps/util/initness/initness/__init__.py
+++ b/apps/util/initness/initness/__init__.py
@@ -1,2 +1,3 @@
 """Initness reports the initialization state and entry-point variables for the contract migrations process of the CIC services deployment.
 """
+from .state import *
diff --git a/apps/util/initness/initness/runnable/server.py b/apps/util/initness/initness/runnable/server.py
index 2abc1807..6317eb4c 100644
--- a/apps/util/initness/initness/runnable/server.py
+++ b/apps/util/initness/initness/runnable/server.py
@@ -12,6 +12,9 @@ from http.server import (
 # external imports
 import confini
 
+# local imports
+from initness import get_state
+
 
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
@@ -47,36 +50,6 @@ config.dict_override(args_override, 'cli flag')
 logg.debug('loaded config: {}\n'.format(config))
 
 
-def get_state(state_store_dir):
-        init_path = os.path.join(state_store_dir, 'init')
-        init_level = 0
-        registry_address = None
-
-        try:
-            f = open(init_path, 'r')
-            init_level = f.read()
-            init_level = init_level.rstrip()
-            f.close()
-        except FileNotFoundError:
-            pass
-
-        registry_path = os.path.join(state_store_dir, 'registry')
-        try:
-            f = open(registry_path, 'r')
-            registry_address = f.read()
-            registry_address = registry_address.rstrip()
-            f.close()
-        except FileNotFoundError:
-            pass
-
-        o = {
-            'runlevel': init_level,
-            'registry': registry_address,
-                }
-
-        return o
-
-
 class StateRequestHandler(BaseHTTPRequestHandler):
 
     state_store_dir = None
diff --git a/apps/util/initness/initness/state.py b/apps/util/initness/initness/state.py
new file mode 100644
index 00000000..aaa9c0fe
--- /dev/null
+++ b/apps/util/initness/initness/state.py
@@ -0,0 +1,31 @@
+# standard imports
+import os
+
+def get_state(state_store_dir):
+        init_path = os.path.join(state_store_dir, 'init')
+        init_level = 0
+        registry_address = None
+
+        try:
+            f = open(init_path, 'r')
+            init_level = f.read()
+            init_level = init_level.rstrip()
+            f.close()
+        except FileNotFoundError:
+            pass
+
+        registry_path = os.path.join(state_store_dir, 'registry')
+        try:
+            f = open(registry_path, 'r')
+            registry_address = f.read()
+            registry_address = registry_address.rstrip()
+            f.close()
+        except FileNotFoundError:
+            pass
+
+        o = {
+            'runlevel': init_level,
+            'registry': registry_address,
+                }
+
+        return o