[WIP] Incubation - File Structure Refactoring

Author: keenondrums

plenum/client/client.py

@@ -67,8 +67,8 @@ def __init__(self,
         :param ha: tuple of host and port
         """
         self.config = config or getConfig()
-        basedirpath = self.config.baseDir if not basedirpath else basedirpath
-        self.basedirpath = basedirpath
+        self.basedirpath = basedirpath or os.path.join(self.config.baseDir,
+                                                       self.config.NETWORK_NAME)
 
         signer = Signer(sighex)
         sighex = signer.keyraw
@@ -82,9 +82,9 @@ def __init__(self,
 
         cha = None
         # If client information already exists is RAET then use that
-        if self.exists(self.stackName, basedirpath):
+        if self.exists(self.stackName, self.basedirpath):
             cha = self.nodeStackClass.getHaFromLocal(
-                self.stackName, basedirpath)
+                self.stackName, self.basedirpath)
             if cha:
                 cha = HA(*cha)
                 logger.debug("Client {} ignoring given ha {} and using {}".

plenum/config.py

@@ -24,8 +24,9 @@
     ('DeltaC', ('127.0.0.1', 9708))
 ])
 
-baseDir = '~/.plenum/networks/'
+baseDir = '~/.plenum/'
 walletsDir = 'wallets'
+NODE_BASE_DATA_DIR = '/var/plenum'
 nodeDataDir = 'data/nodes'
 clientDataDir = 'data/clients'
 LOG_DIR = '/var/log/plenum/'

plenum/server/node.py

@@ -110,6 +110,7 @@ def __init__(self,
                  cliname: str=None,
                  cliha: HA=None,
                  basedirpath: str=None,
+                 base_data_dir: str=None,
                  primaryDecider: PrimaryDecider = None,
                  pluginPaths: Iterable[str]=None,
                  storage: Storage=None,
@@ -128,12 +129,14 @@ def __init__(self,
         self.created = time.time()
         self.name = name
         self.config = config or getConfig()
-        self.basedirpath = basedirpath or config.baseDir
+        self.basedirpath = basedirpath or os.path.join(config.baseDir, config.NETWORK_NAME)
         self.dataDir = self.config.nodeDataDir or "data/nodes"
+        self.base_data_dir = base_data_dir or os.path.join(self.config.NODE_BASE_DATA_DIR,
+                                                           config.NETWORK_NAME)
 
         self._view_change_timeout = self.config.VIEW_CHANGE_TIMEOUT
 
-        HasFileStorage.__init__(self, name, baseDir=self.basedirpath,
+        HasFileStorage.__init__(self, name, baseDir=self.base_data_dir,
                                 dataDir=self.dataDir)
         self.ensureKeysAreSetup()
         self.opVerifiers = self.getPluginsByType(pluginPaths,