change config.baseDir to self.baseDir

Author: Dmitry Surnin

plenum/cli/cli.py

@@ -943,6 +943,7 @@ def newNode(self, nodeName: str):
                 node = self.NodeClass(name,
                                       nodeRegistry=nodeRegistry,
                                       basedirpath=self.basedirpath,
+                                      base_data_dir=self.basedirpath,
                                       pluginPaths=self.pluginPaths,
                                       config=self.config)
             except KeysNotFoundException as e:
@@ -1874,7 +1875,7 @@ def getNoEnvWalletsBaseDir(self):
             os.path.join(self.getWalletsBaseDir(), NO_ENV))
 
     def getWalletsBaseDir(self):
-        return os.path.expanduser(os.path.join(self.config.baseDir,
+        return os.path.expanduser(os.path.join(self.basedirpath,
                                                self.config.walletsDir))
 
     def getContextBasedWalletsBaseDir(self):
@@ -2041,7 +2042,7 @@ def printUsage(self, msgs):
     # TODO: Do we keep this? What happens when we allow the CLI to connect
     # to remote nodes?
     def cleanUp(self):
-        dataPath = os.path.join(self.config.baseDir, "data")
+        dataPath = os.path.join(self.basedirpath, "data")
         try:
             shutil.rmtree(dataPath, ignore_errors=True)
         except FileNotFoundError:

plenum/server/node.py

@@ -531,7 +531,7 @@ def getPrimaryStorage(self):
             # TODO: add a place for initialization of all ledgers, so it's clear what ledgers we have,
             # and how they are initialized
             genesis_txn_initiator = GenesisTxnInitiatorFromFile(
-                self.config.baseDir, self.config.domainTransactionsFile)
+                self.basedirpath, self.config.domainTransactionsFile)
             return Ledger(
                 CompactMerkleTree(
                     hashStore=self.getHashStore('domain')),
@@ -2724,6 +2724,6 @@ def logNodeInfo(self):
         """
         self.nodeInfo['data'] = self.collectNodeInfo()
 
-        with closing(open(os.path.join(self.config.baseDir, 'node_info'), 'w')) \
+        with closing(open(os.path.join(self.basedirpath, 'node_info'), 'w')) \
                 as logNodeInfoFile:
             logNodeInfoFile.write(json.dumps(self.nodeInfo['data']))