File struct (#396)

* fix serialization in JsonSerializer (#393)

* Add base dir to Client constructor in tests

* Fix code validation

Author: dsurnin

common/serializers/json_serializer.py

@@ -38,7 +38,7 @@ def encode(self, o):
             if isinstance(o, (bytes, bytearray)):
                 return '"{}"'.format(base64.b64encode(o).decode("utf-8"))
             else:
-                return json.JSONEncoder.encode(self, o)
+                return super().encode(o)
 
     JsonEncoder = OrderedJsonEncoder()
 

plenum/common/script_helper.py

@@ -241,19 +241,20 @@ def __checkClientConnected(cli, ):
 
 
 def changeHA(looper, config, nodeName, nodeSeed, newNodeHA,
-             stewardName, stewardsSeed, newClientHA=None):
+             stewardName, stewardsSeed, newClientHA=None, basedir=None):
     if not newClientHA:
         newClientHA = HA(newNodeHA.host, newNodeHA.port + 1)
 
+    assert basedir is not None
+
     # prepare steward wallet
     stewardSigner = SimpleSigner(seed=stewardsSeed)
     stewardWallet = Wallet(stewardName)
     stewardWallet.addIdentifier(signer=stewardSigner)
 
     # prepare client to submit change ha request
     _, randomClientPort = genHa()
-    client = Client(stewardName,
-                    ha=('0.0.0.0', randomClientPort), config=config)
+    client = Client(stewardName, ha=('0.0.0.0', randomClientPort), config=config, basedirpath=basedir)
     looper.add(client)
     timeout = waits.expectedClientToPoolConnectionTimeout(4)
     looper.run(eventually(__checkClientConnected, client,

plenum/config.py

@@ -33,7 +33,7 @@
 GENERAL_CONFIG_DIR = '/etc/plenum/'
 # walletDir = 'wallet'
 
-# it should be filled from baseConfig 
+# it should be filled from baseConfig
 NETWORK_NAME = ''
 
 GENERAL_CONFIG_FILE = 'plenum_config.py'

plenum/test/script/helper.py

@@ -24,7 +24,7 @@ def looper(txnPoolNodesLooper):
 
 
 def changeNodeHa(looper, txnPoolNodeSet, tdirWithPoolTxns,
-                 poolTxnData, poolTxnStewardNames, tconf, shouldBePrimary):
+                 poolTxnData, poolTxnStewardNames, tconf, shouldBePrimary, tdir):
 
     # prepare new ha for node and client stack
     subjectedNode = None
@@ -46,7 +46,7 @@ def changeNodeHa(looper, txnPoolNodeSet, tdirWithPoolTxns,
 
     # change HA
     stewardClient, req = changeHA(looper, tconf, subjectedNode.name, nodeSeed,
-                                  nodeStackNewHA, stewardName, stewardsSeed)
+                                  nodeStackNewHA, stewardName, stewardsSeed, basedir=tdir)
 
     waitForSufficientRepliesForRequests(looper, stewardClient,
                                         requests=[req])

plenum/test/script/test_change_non_primary_node_ha.py

@@ -15,12 +15,13 @@
 
 @pytest.mark.skipif('sys.platform == "win32"', reason='SOV-330')
 def testChangeNodeHaForNonPrimary(looper, txnPoolNodeSet, tdirWithPoolTxns,
-                                  poolTxnData, poolTxnStewardNames, tconf):
+                                  poolTxnData, poolTxnStewardNames, tconf, tdir):
 
     changeNodeHa(looper,
                  txnPoolNodeSet,
                  tdirWithPoolTxns,
                  poolTxnData,
                  poolTxnStewardNames,
                  tconf,
-                 shouldBePrimary=False)
+                 shouldBePrimary=False,
+                 tdir=tdir)

plenum/test/script/test_change_primary_node_ha.py

@@ -15,11 +15,12 @@
 
 @pytest.mark.skipif('sys.platform == "win32"', reason='SOV-330')
 def testChangeNodeHaForPrimary(looper, txnPoolNodeSet, tdirWithPoolTxns,
-                               poolTxnData, poolTxnStewardNames, tconf):
+                               poolTxnData, poolTxnStewardNames, tconf, tdir):
     changeNodeHa(looper,
                  txnPoolNodeSet,
                  tdirWithPoolTxns,
                  poolTxnData,
                  poolTxnStewardNames,
                  tconf,
-                 shouldBePrimary=True)
+                 shouldBePrimary=True,
+                 tdir=tdir)