Move db settings from utils to child chain

omgnetwork · Aug 21, 2018 · d5a8d7a · d5a8d7a
1 parent 6e1c634
commit d5a8d7a
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 9 deletions.
diff --git a/plasma_cash/utils/db/__init__.py → plasma_cash/child_chain/db/__init__.py b/plasma_cash/utils/db/__init__.py → plasma_cash/child_chain/db/__init__.py
diff --git a/plasma_cash/utils/db/db_interface.py → plasma_cash/child_chain/db/db_interface.py b/plasma_cash/utils/db/db_interface.py → plasma_cash/child_chain/db/db_interface.py
diff --git a/plasma_cash/utils/db/exceptions.py → plasma_cash/child_chain/db/exceptions.py b/plasma_cash/utils/db/exceptions.py → plasma_cash/child_chain/db/exceptions.py
diff --git a/plasma_cash/utils/db/leveldb.py → plasma_cash/child_chain/db/leveldb.py b/plasma_cash/utils/db/leveldb.py → plasma_cash/child_chain/db/leveldb.py
diff --git a/plasma_cash/utils/db/memory_db.py → plasma_cash/child_chain/db/memory_db.py b/plasma_cash/utils/db/memory_db.py → plasma_cash/child_chain/db/memory_db.py
diff --git a/plasma_cash/dependency_config.py b/plasma_cash/dependency_config.py
@@ -1,19 +1,18 @@
 import os
 
 from plasma_cash.child_chain.child_chain import ChildChain
+from plasma_cash.child_chain.db.leveldb import LevelDb
+from plasma_cash.child_chain.db.memory_db import MemoryDb
 from plasma_cash.client.child_chain_client import ChildChainClient
 from plasma_cash.config import PROJECT_DIR, db_config, plasma_config
 from plasma_cash.root_chain.deployer import Deployer
-from plasma_cash.utils.db.leveldb import LevelDb
-from plasma_cash.utils.db.memory_db import MemoryDb
 
 
 class DependencyContainer(object):
     def __init__(self):
         self._root_chain = None
         self._child_chain = None
         self._child_chain_client = None
-        self._client = None
         self._db = None
 
     def get_db(self):

diff --git a/unit_tests/utils/db/__init__.py → unit_tests/child_chain/db/__init__.py b/unit_tests/utils/db/__init__.py → unit_tests/child_chain/db/__init__.py
diff --git a/unit_tests/utils/db/test_leveldb.py → unit_tests/child_chain/db/test_leveldb.py b/unit_tests/utils/db/test_leveldb.py → unit_tests/child_chain/db/test_leveldb.py
@@ -2,8 +2,8 @@
 from mockito import ANY, when
 
 from plasma_cash.child_chain.block import Block
-from plasma_cash.utils.db.exceptions import BlockAlreadyExistsException
-from plasma_cash.utils.db.leveldb import LevelDb
+from plasma_cash.child_chain.db.exceptions import BlockAlreadyExistsException
+from plasma_cash.child_chain.db.leveldb import LevelDb
 from unit_tests.unstub_mixin import UnstubMixin
 
 
@@ -35,7 +35,7 @@ class TestLevelDb(UnstubMixin):
     @pytest.fixture(scope='function')
     def db(self):
         db = FakeLevelDb()
-        (when('plasma_cash.utils.db.leveldb.plyvel')
+        (when('plasma_cash.child_chain.db.leveldb.plyvel')
             .DB(ANY, create_if_missing=True).thenReturn(db))
         return LevelDb('test_db')
 

diff --git a/unit_tests/utils/db/test_memory_db.py → unit_tests/child_chain/db/test_memory_db.py b/unit_tests/utils/db/test_memory_db.py → unit_tests/child_chain/db/test_memory_db.py
@@ -1,7 +1,7 @@
 import pytest
 
-from plasma_cash.utils.db.exceptions import BlockAlreadyExistsException
-from plasma_cash.utils.db.memory_db import MemoryDb
+from plasma_cash.child_chain.db.exceptions import BlockAlreadyExistsException
+from plasma_cash.child_chain.db.memory_db import MemoryDb
 
 
 class TestMemoryDb(object):

diff --git a/unit_tests/child_chain/test_child_chain.py b/unit_tests/child_chain/test_child_chain.py
@@ -7,6 +7,7 @@
 
 from plasma_cash.child_chain.block import Block
 from plasma_cash.child_chain.child_chain import ChildChain
+from plasma_cash.child_chain.db.memory_db import MemoryDb
 from plasma_cash.child_chain.exceptions import (InvalidBlockNumException,
                                                 InvalidBlockSignatureException,
                                                 InvalidTxSignatureException,
@@ -15,7 +16,6 @@
                                                 TxAmountMismatchException,
                                                 TxWithSameUidAlreadyExists)
 from plasma_cash.child_chain.transaction import Transaction
-from plasma_cash.utils.db.memory_db import MemoryDb
 from unit_tests.unstub_mixin import UnstubMixin