Merge pull request #346 from andkononykhin/rc-3.2

Rc 3.2. Added missing commits: 58d6b4e and d77f9b6

Author: andkononykhin

Diff for: scripts/add_keys.py

@@ -100,7 +100,7 @@ async def ensureConnectedToNodes(client):
 
 
 def addNyms():
-    with Looper(debug=True) as looper:
+    with Looper(debug=getConfig().LOOPER_DEBUG) as looper:
 
         from sovrin_client.test.helper import createNym
 

Diff for: scripts/add_new_node

@@ -10,7 +10,7 @@ from sovrin_common.config_util import getConfig
 # TODO: This code is obsolete, moreover we have a CLI command for this.
 
 
-looper = Looper(debug=True)
+looper = Looper(debug=getConfig().LOOPER_DEBUG)
 
 config = getConfig()
 basedirpath = config.baseDir

Diff for: scripts/change_node_ha

@@ -45,7 +45,7 @@ def getHA(s):
 if __name__ == '__main__':
     args = parseArgs()
     config = getConfig()
-    with Looper(debug=True) as looper:
+    with Looper(debug=config.LOOPER_DEBUG) as looper:
         client, req = changeHA(looper,
                                config,
                                args.nodeName,

Diff for: scripts/load.py

@@ -9,6 +9,7 @@
 from stp_core.network.port_dispenser import genHa, HA
 from stp_core.loop.looper import Looper
 from plenum.test.helper import waitForSufficientRepliesForRequests
+from sovrin_common.config_util import getConfig
 
 numReqs = 100
 splits = 1
@@ -36,7 +37,7 @@ def put_load():
     wallet.addIdentifier(
         signer=DidSigner(seed=b'000000000000000000000000Steward1'))
     client = Client(name, ha=ha)
-    with Looper(debug=True) as looper:
+    with Looper(debug=getConfig().LOOPER_DEBUG) as looper:
         looper.add(client)
         print('Will send {} reqs in all'.format(numReqs))
         requests = sendRandomRequests(wallet, client, numReqs)

Diff for: scripts/load_test.py

@@ -392,7 +392,7 @@ def buildCoros(coroFunc, corosArgs):
     clientPoll = ClientPoll(args.clientsListFilePath,
                             args.numberOfClients, args.numberOfClientsToSkip)
 
-    with Looper(debug=True) as looper:
+    with Looper() as looper:
 
         # connect
 

Diff for: scripts/sovrin

@@ -44,7 +44,7 @@ def run_cli():
 
     withNode = True if '--with-node' in commands else False
 
-    with Looper(debug=False) as looper:
+    with Looper(debug=config.LOOPER_DEBUG) as looper:
         curDir = os.getcwd()
         logFilePath = os.path.join(curDir, config.logFilePath)
         cli = SovrinCli(looper=looper,

Diff for: setup.py

@@ -87,7 +87,7 @@ def run(self):
     data_files=[(
         (BASE_DIR, ['data/nssm_original.exe'])
     )],
-    install_requires=['indy-plenum==1.1.26',
+    install_requires=['indy-plenum==1.1.27',
                       'indy-anoncreds==1.0.10',
                       'python-dateutil',
                       'timeout-decorator'],

Diff for: sovrin_client/agent/run_agent.py

@@ -4,6 +4,7 @@
 from plenum.common.exceptions import NoConsensusYet
 from stp_core.common.log import getlogger
 from sovrin_client.agent.agent_cli import AgentCli
+from sovrin_common.config_util import getConfig
 
 from stp_core.loop.looper import Looper
 
@@ -50,7 +51,7 @@ def run(looper):
     if looper:
         run(looper)
     else:
-        with Looper(debug=False) as looper:
+        with Looper(debug=config.LOOPER_DEBUG) as looper:
             run(looper)
 
 
@@ -67,7 +68,7 @@ def do_run(looper):
     if looper:
         do_run(looper)
     else:
-        with Looper(debug=True, loop=agent.loop) as looper:
+        with Looper(debug=getConfig().LOOPER_DEBUG, loop=agent.loop) as looper:
             do_run(looper)
             looper.run()
 

Diff for: sovrin_client/utils/user_scenarios.py

@@ -16,6 +16,7 @@
 from sovrin_client.client.client import Client
 from sovrin_client.client.wallet.wallet import Wallet
 from sovrin_common.constants import NYM, GET_NYM
+from sovrin_common.config_util import getConfig
 
 logger = getlogger()
 
@@ -54,7 +55,7 @@ def run(self):
         try:
             self._createClientAndWallet()
 
-            self._looper = Looper(debug=True)
+            self._looper = Looper(debug=getConfig().LOOPER_DEBUG)
             try:
                 self._startClient()
                 self.do()

Diff for: sovrin_node/test/replay/test_successive_batch_no_state_change.py

@@ -32,7 +32,7 @@ def reset():
 def test_successive_batch_do_no_change_state(looper, tdirWithPoolTxns,
                                              tdirWithDomainTxnsUpdated,
                                              tconf, nodeSet,
-                                             trustee, trusteeWallet):
+                                             trustee, trusteeWallet, monkeypatch):
     """
     Send 2 NYM txns in different batches such that the second batch does not
     change state so that state root remains same, but keep the identifier
@@ -111,9 +111,12 @@ def check_uncommitted(count):
     pp_seq_no_to_delay = 4
     for node in other_nodes:
         node.nodeIbStasher.delay(specific_pre_prepare)
+        # disable requesting missing 3 phase messages. Otherwise PP delay won't work
+        for rpl in node.replicas:
+            monkeypatch.setattr(rpl, '_request_missing_three_phase_messages', lambda *x, **y: None)
 
     # Setting the verkey to `x`, then `y` and then back to `x` but in different
-    # batches with different with different request ids. The idea is to change
+    # batches with different request ids. The idea is to change
     # state root to `t` then `t'` and then back to `t` and observe that no
     # errors are encountered
 
@@ -139,8 +142,9 @@ def check_uncommitted(count):
     looper.run(eventually(check_uncommitted, 0))
 
     check_verkey(new_idr, verkey)
+    monkeypatch.undo()
 
-    # Dleay COMMITs so that IdrCache can be checked for correct
+    # Delay COMMITs so that IdrCache can be checked for correct
     # number of entries
 
     uncommitteds = {}

Diff for: sovrin_node/utils/node_runner.py

@@ -22,7 +22,7 @@ def run_node(config, name, node_port, client_port):
 
     from stp_core.loop.looper import Looper
     from sovrin_node.server.node import Node
-    with Looper(debug=True) as looper:
+    with Looper(debug=config.LOOPER_DEBUG) as looper:
         node = Node(name, nodeRegistry=None, basedirpath=config.baseDir,
                     ha=node_ha, cliha=client_ha)
         looper.add(node)