diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-05-05 00:10:39 +0300 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-05-05 19:28:09 +0300 |
| commit | 17290bc6d011ec3bd3dfb4cdbefa3bb7843ee660 (patch) | |
| tree | b14c8983052f20acc8510cae47e933c02411367c | |
| parent | d32368d1670adb2f093d2303c657b39ae8c4641c (diff) | |
DBO_rzdb__init_DB: decouple rz_config dep -> rz_config.rzdoc__mainpage_name
| -rw-r--r-- | src/server-tests/test_db_controller.py | 2 | ||||
| -rw-r--r-- | src/server/db_op.py | 4 | ||||
| -rw-r--r-- | src/server/rz_kernel.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/server-tests/test_db_controller.py b/src/server-tests/test_db_controller.py index 9c47e6bc..e57aa1d6 100644 --- a/src/server-tests/test_db_controller.py +++ b/src/server-tests/test_db_controller.py @@ -359,7 +359,7 @@ class TestDBController(unittest.TestCase): def test_rzdb__init_DB(self): rz_cfg = Config.generate_default() - op = DBO_rzdb__init_DB(rz_cfg) + op = DBO_rzdb__init_DB(rz_cfg.rzdoc__mainpage_name) try: # assert first init call passes self.db_ctl.exec_op(op) except: diff --git a/src/server/db_op.py b/src/server/db_op.py index b26e280a..89d61cd1 100644 --- a/src/server/db_op.py +++ b/src/server/db_op.py @@ -748,7 +748,7 @@ class DBO_rzdb__init_DB(DB_composed_op): q_params = {'db_attr': {'schema_version': neo4j_schema.NEO4J_SCHEMA_VERSION}} self.add_statement(q_arr, q_params) - def __init__(self, rz_config): + def __init__(self, rzdoc__mainpage_name): """ Fetch DB metadata """ @@ -761,7 +761,7 @@ class DBO_rzdb__init_DB(DB_composed_op): self.add_sub_op(DBO_rzdb__init_DB._init_DB_subop()) # create mainpage - mainpage_rzdoc = RZDoc(rz_config.rzdoc__mainpage_name) + mainpage_rzdoc = RZDoc(rzdoc__mainpage_name) mainpage_rzdoc.id = 'a000a000' self.add_sub_op(DBO_rzdoc__create(mainpage_rzdoc)) self.add_sub_op(DBO_block_chain__init(mainpage_rzdoc)) diff --git a/src/server/rz_kernel.py b/src/server/rz_kernel.py index 400af13e..0b0581ca 100644 --- a/src/server/rz_kernel.py +++ b/src/server/rz_kernel.py @@ -107,7 +107,7 @@ class RZ_Kernel(object): dbmb = self.db_ctl.exec_op(op_probe) if dbmb is None: log.warning('detected uninitialized DB, initializing') - op_init = DBO_rzdb__init_DB(self.cfg) + op_init = DBO_rzdb__init_DB(self.cfg.rzdoc__mainpage_name) self.db_ctl.exec_op(op_init) op_probe = DBO_rzdb__fetch_DB_metablock() # reprobe for metablock dbmb = self.db_ctl.exec_op(op_probe) |