Merge remote-tracking branch 'base/master' into feature/INDY-1205

Author: Sergey Shilov

plenum/common/constants.py

@@ -117,6 +117,7 @@
 # ROLES
 STEWARD = Roles.STEWARD.value
 TRUSTEE = Roles.TRUSTEE.value
+STEWARD_STRING = 'STEWARD'
 
 # TXNs
 NODE = PlenumTransactions.NODE.value
@@ -171,6 +172,7 @@ class LedgerState(IntEnum):
 POOL_LEDGER_ID = 0
 DOMAIN_LEDGER_ID = 1
 CONFIG_LEDGER_ID = 2
+INVALID_LEDGER_ID = 5908
 
 VALID_LEDGER_IDS = (POOL_LEDGER_ID, DOMAIN_LEDGER_ID, CONFIG_LEDGER_ID)
 
@@ -198,3 +200,6 @@ class ReplicaHooks(UniqueSet):
     RECV_PPR = 5
     RECV_PR = 6
     RECV_CM = 7
+
+
+INVALID_SEQ_NO = -23

plenum/common/exceptions.py

@@ -280,3 +280,19 @@ def __init__(self, expLen, actLen, *args, **kwargs):
         ex_txt = 'Message len {} exceeded allowed limit of {}'.format(
             actLen, expLen)
         super().__init__(ex_txt, *args, **kwargs)
+
+
+class RequestNackedException(Exception):
+    pass
+
+
+class RequestRejectedException(Exception):
+    pass
+
+
+class CommonSdkIOException(Exception):
+    pass
+
+
+class PoolLedgerTimeoutException(Exception):
+    pass

plenum/common/messages/fields.py

@@ -240,7 +240,7 @@ class NetworkPortField(FieldBase):
     _base_types = (int,)
 
     def _specific_validation(self, val):
-        if val < 0 or val > 65535:
+        if val <= 0 or val > 65535:
             return 'network port out of the range 0-65535'
 
 

plenum/server/pool_req_handler.py

@@ -80,7 +80,7 @@ def authErrorWhileAddingNode(self, request):
                 origin)
         if self.stewardHasNode(origin):
             return "{} already has a node".format(origin)
-        if self.isNodeDataConflicting(operation.get(DATA, {})):
+        if self.isNodeDataConflicting(data):
             return "existing data has conflicts with " \
                    "request data {}".format(operation.get(DATA))
 
@@ -156,14 +156,14 @@ def isNodeDataSame(self, nodeNym, newData, isCommitted=True):
         nodeInfo.pop(f.IDENTIFIER.nm, None)
         return nodeInfo == newData
 
-    def isNodeDataConflicting(self, data, nodeNym=None):
+    def isNodeDataConflicting(self, data, updatingNym=None):
         # Check if node's ALIAS or IPs or ports conflicts with other nodes,
         # also, the node is not allowed to change its alias.
 
         # Check ALIAS change
         nodeData = {}
-        if nodeNym:
-            nodeData = self.getNodeData(nodeNym, isCommitted=False)
+        if updatingNym:
+            nodeData = self.getNodeData(updatingNym, isCommitted=False)
             if nodeData.get(ALIAS) != data.get(ALIAS):
                 return True
             else:
@@ -177,7 +177,7 @@ def isNodeDataConflicting(self, data, nodeNym=None):
             otherNodeData = self.stateSerializer.deserialize(otherNodeData)
             otherNodeData.pop(f.IDENTIFIER.nm, None)
             otherNodeData.pop(SERVICES, None)
-            if not nodeNym or otherNode != nodeNym:
+            if not updatingNym or otherNode != updatingNym:
                 # The node's ip, port and alias shuuld be unique
                 bag = set()
                 for d in (nodeData, otherNodeData):
@@ -191,6 +191,9 @@ def isNodeDataConflicting(self, data, nodeNym=None):
                 if (not nodeData and len(bag) != 3) or (
                         nodeData and len(bag) != 6):
                     return True
+            if data.get(ALIAS) == otherNodeData.get(
+                    ALIAS) and not updatingNym:
+                return True
 
     def dataErrorWhileValidatingUpdate(self, data, nodeNym):
         error = self.dataErrorWhileValidating(data, skipKeys=True)

plenum/test/batching_3pc/test_basic_batching.py

@@ -1,15 +1,15 @@
 import types
 import pytest
-from plenum.common.exceptions import UnauthorizedClientRequest
+from plenum.common.exceptions import UnauthorizedClientRequest, RequestRejectedException
 from plenum.test.batching_3pc.helper import checkNodesHaveSameRoots
-from plenum.test.helper import sendRandomRequests, checkRejectWithReason, waitForSufficientRepliesForRequests
+from plenum.test.helper import sdk_send_random_requests, sdk_get_and_check_replies
 from stp_core.loop.eventually import eventually
 from plenum.common.exceptions import InvalidClientRequest
 from plenum.test.helper import sdk_sign_request_from_dict, sdk_send_random_and_check
 from plenum.common.request import Request
 
 
-def testRequestStaticValidation(tconf, looper,txnPoolNodeSet,
+def testRequestStaticValidation(tconf, looper, txnPoolNodeSet,
                                 sdk_wallet_client):
     """
     Check that for requests which fail static validation, REQNACK is sent
@@ -59,7 +59,7 @@ def testTreeRootsCorrectAfterEachBatch(tconf, looper, txnPoolNodeSet,
 
 
 def testRequestDynamicValidation(tconf, looper, txnPoolNodeSet,
-                                 client, wallet1):
+                                 sdk_pool_handle, sdk_wallet_client):
     """
     Check that for requests which fail dynamic (state based) validation,
     REJECT is sent to the client
@@ -82,16 +82,14 @@ def rejectingMethod(self, req):
         origMethods.append(node.doDynamicValidation)
         node.doDynamicValidation = types.MethodType(rejectingMethod, node)
 
-    reqs = sendRandomRequests(wallet1, client, tconf.Max3PCBatchSize)
-    waitForSufficientRepliesForRequests(looper, client, requests=reqs[:-1])
+    reqs = sdk_send_random_requests(looper, sdk_pool_handle,
+                                    sdk_wallet_client,
+                                    tconf.Max3PCBatchSize)
+    sdk_get_and_check_replies(looper, reqs[:-1])
+    with pytest.raises(RequestRejectedException) as e:
+        sdk_get_and_check_replies(looper, reqs[-1:])
 
-    with pytest.raises(AssertionError):
-        waitForSufficientRepliesForRequests(looper, client, requests=reqs[-1:])
-
-    for node in txnPoolNodeSet:
-        looper.run(eventually(checkRejectWithReason, client,
-                              'Simulated rejection', node.clientstack.name,
-                              retryWait=1))
+    assert 'Simulated rejection' in e._excinfo[1].args[0]
 
     for i, node in enumerate(txnPoolNodeSet):
         node.doDynamicValidation = origMethods[i]

plenum/test/batching_3pc/test_batch_rejection.py

@@ -5,23 +5,20 @@
 from stp_core.loop.eventually import eventually
 from plenum.common.constants import DOMAIN_LEDGER_ID
 from plenum.common.util import updateNamedTuple
-from plenum.test.helper import sendRandomRequests, \
-    waitForSufficientRepliesForRequests
-from plenum.test.test_node import getNonPrimaryReplicas, getPrimaryReplica
+from plenum.test.helper import sdk_send_random_requests, \
+    sdk_send_random_and_check
+from plenum.test.test_node import getNonPrimaryReplicas, \
+    getPrimaryReplica
 
 
 @pytest.fixture(scope="module")
-def setup(tconf, looper, txnPoolNodeSet, client, wallet1):
+def setup(tconf, looper, txnPoolNodeSet, sdk_pool_handle, sdk_wallet_client):
     # Patch the 3phase request sending method to send incorrect digest and
     pr, otherR = getPrimaryReplica(txnPoolNodeSet, instId=0), \
-        getNonPrimaryReplicas(txnPoolNodeSet, instId=0)
-
-    reqs = sendRandomRequests(wallet1, client, tconf.Max3PCBatchSize)
-    waitForSufficientRepliesForRequests(
-        looper,
-        client,
-        requests=reqs,
-        customTimeoutPerReq=tconf.Max3PCBatchWait)
+                 getNonPrimaryReplicas(txnPoolNodeSet, instId=0)
+
+    sdk_send_random_and_check(looper, txnPoolNodeSet, sdk_pool_handle,
+                              sdk_wallet_client, tconf.Max3PCBatchSize)
     stateRoot = pr.stateRootHash(DOMAIN_LEDGER_ID, to_str=False)
 
     origMethod = pr.create3PCBatch
@@ -36,7 +33,8 @@ def badMethod(self, ledgerId):
         return pp
 
     pr.create3PCBatch = types.MethodType(badMethod, pr)
-    sendRandomRequests(wallet1, client, tconf.Max3PCBatchSize)
+    sdk_send_random_requests(looper, sdk_pool_handle, sdk_wallet_client,
+                             tconf.Max3PCBatchSize)
     return pr, otherR, stateRoot
 
 
@@ -75,15 +73,13 @@ def testViewChangeAfterBatchRejected(viewChanged):
     """
 
 
-def testMoreBatchesWillBeSentAfterViewChange(reverted, viewChanged, wallet1,
-                                             client, tconf, looper):
+def testMoreBatchesWillBeSentAfterViewChange(reverted, viewChanged,
+                                             txnPoolNodeSet,
+                                             sdk_pool_handle, sdk_wallet_client,
+                                             tconf, looper):
     """
     After retrying discarded batches, new batches are sent
     :return:
     """
-    reqs = sendRandomRequests(wallet1, client, tconf.Max3PCBatchSize)
-    waitForSufficientRepliesForRequests(
-        looper,
-        client,
-        requests=reqs,
-        customTimeoutPerReq=tconf.Max3PCBatchWait)
+    sdk_send_random_and_check(looper, txnPoolNodeSet, sdk_pool_handle,
+                              sdk_wallet_client, tconf.Max3PCBatchSize)

plenum/test/helper.py

@@ -23,6 +23,8 @@
 from plenum.client.wallet import Wallet
 from plenum.common.constants import DOMAIN_LEDGER_ID, OP_FIELD_NAME, REPLY, REQACK, REQNACK, REJECT, \
     CURRENT_PROTOCOL_VERSION
+from plenum.common.exceptions import RequestNackedException, RequestRejectedException, CommonSdkIOException, \
+    PoolLedgerTimeoutException
 from plenum.common.messages.node_messages import Reply, PrePrepare, Prepare, Commit
 from plenum.common.types import f
 from plenum.common.util import getNoInstances, get_utc_epoch
@@ -1057,14 +1059,18 @@ def get_res(task, done_list):
 def sdk_check_reply(req_res):
     req, res = req_res
     if isinstance(res, ErrorCode):
-        raise AssertionError("Got an error with code {} for request {}"
-                             .format(res, req))
+        if res == 307:
+            raise PoolLedgerTimeoutException('Got PoolLedgerTimeout for request {}'
+                                             .format(req))
+        else:
+            raise CommonSdkIOException('Got an error with code {} for request {}'
+                                       .format(res, req))
     if res['op'] == REQNACK:
-        raise AssertionError("ReqNack of id {}. Reason: {}"
-                             .format(req['reqId'], res['reason']))
+        raise RequestNackedException('ReqNack of id {}. Reason: {}'
+                                     .format(req['reqId'], res['reason']))
     if res['op'] == REJECT:
-        raise AssertionError("Reject of id {}. Reason: {}"
-                             .format(req['reqId'], res['reason']))
+        raise RequestRejectedException('Reject of id {}. Reason: {}'
+                                       .format(req['reqId'], res['reason']))
 
 
 def sdk_get_and_check_replies(looper, sdk_req_resp: Sequence, timeout=None):

plenum/test/input_validation/helper.py

@@ -183,11 +183,11 @@ class NetworkPortField(TestFieldBase):
 
     @property
     def negative_test_cases(self):
-        return -1, 65535 + 1
+        return 0, -1, 65535 + 1
 
     @property
     def positive_test_cases(self):
-        return 0, 9700, 65535
+        return 0 + 1, 9700, 65535
 
 
 class NetworkIpAddressField(TestFieldBase):

plenum/test/logging/test_logging_txn_state.py

@@ -1,18 +1,22 @@
 import functools
+import json
 
+import pytest
+
+from plenum.common.exceptions import RequestRejectedException
+from plenum.common.util import randomString
 from stp_core.loop.eventually import eventually
 
-from plenum.common.constants import STEWARD, DOMAIN_LEDGER_ID
+from plenum.common.constants import DOMAIN_LEDGER_ID, STEWARD_STRING
 
-from plenum.test.pool_transactions.conftest import looper, stewardAndWallet1, \
-    steward1, stewardWallet, client1, clientAndWallet1, client1Connected
-from plenum.test.pool_transactions.helper import sendAddNewClient
+from plenum.test.pool_transactions.conftest import looper
+from plenum.test.pool_transactions.helper import prepare_nym_request, \
+    sdk_sign_and_send_prepared_request
 from plenum.test import waits
-from plenum.test.helper import ensureRejectsRecvd, sdk_send_random_and_check
+from plenum.test.helper import sdk_send_random_and_check, sdk_get_and_check_replies
 
 
 ERORR_MSG = "something went wrong"
-whitelist = [ERORR_MSG]
 
 
 def testLoggingTxnStateForValidRequest(
@@ -33,7 +37,8 @@ def testLoggingTxnStateForValidRequest(
         funcs=['executeBatch'], msgs=['committed batch request']
     )
 
-    reqs = sdk_send_random_and_check(looper, txnPoolNodeSet, sdk_pool_handle, sdk_wallet_client, 1)
+    reqs = sdk_send_random_and_check(looper, txnPoolNodeSet, sdk_pool_handle,
+                                     sdk_wallet_client, 1)
     req, _ = reqs[0]
 
     reqId = str(req['reqId'])
@@ -43,10 +48,7 @@ def testLoggingTxnStateForValidRequest(
 
 
 def testLoggingTxnStateForInvalidRequest(
-        looper, txnPoolNodeSet, clientAndWallet1, client1Connected, logsearch):
-
-    client, clientWallet = clientAndWallet1
-
+        looper, txnPoolNodeSet, sdk_pool_handle, sdk_wallet_client, logsearch):
     logsPropagate, _ = logsearch(
         levels=['INFO'], files=['propagator.py'],
         funcs=['propagate'], msgs=['propagating.*request.*from client']
@@ -58,21 +60,28 @@ def testLoggingTxnStateForInvalidRequest(
         msgs=['encountered exception.*while processing.*will reject']
     )
 
-    req, wallet = sendAddNewClient(STEWARD, "name", client, clientWallet)
+    seed = randomString(32)
+    wh, _ = sdk_wallet_client
 
-    ensureRejectsRecvd(
-        looper, txnPoolNodeSet, client,
-        reason="Only Steward is allowed to do these transactions",
-        timeout=waits.expectedReqRejectQuorumTime()
-    )
+    nym_request, _ = looper.loop.run_until_complete(
+        prepare_nym_request(sdk_wallet_client, seed,
+                            "name", STEWARD_STRING))
+
+    request_couple = sdk_sign_and_send_prepared_request(looper, sdk_wallet_client,
+                                                        sdk_pool_handle, nym_request)
 
-    reqId = str(req.reqId)
+    with pytest.raises(RequestRejectedException) as e:
+        sdk_get_and_check_replies(looper, [request_couple])
+
+    assert 'Only Steward is allowed to do these transactions' in e._excinfo[1].args[0]
+
+    reqId = str(json.loads(nym_request)['reqId'])
     assert any(reqId in record.getMessage() for record in logsPropagate)
     assert any(reqId in record.getMessage() for record in logsReject)
 
 
 def testLoggingTxnStateWhenCommitFails(
-        looper, txnPoolNodeSet, steward1, stewardWallet, logsearch):
+        looper, txnPoolNodeSet, sdk_pool_handle, sdk_wallet_steward, logsearch):
     logsPropagate, _ = logsearch(
         levels=['INFO'], files=['propagator.py'],
         funcs=['propagate'], msgs=['propagating.*request.*from client']
@@ -88,7 +97,15 @@ def testLoggingTxnStateWhenCommitFails(
         funcs=['executeBatch'], msgs=['commit failed for batch request']
     )
 
-    req, wallet = sendAddNewClient(None, "name", steward1, stewardWallet)
+    seed = randomString(32)
+    wh, _ = sdk_wallet_steward
+
+    nym_request, _ = looper.loop.run_until_complete(
+        prepare_nym_request(sdk_wallet_steward, seed,
+                            "name", None))
+
+    sdk_sign_and_send_prepared_request(looper, sdk_wallet_steward,
+                                       sdk_pool_handle, nym_request)
 
     class SomeError(Exception):
         pass
@@ -127,7 +144,7 @@ def checkSufficientExceptionsHappend():
         eventually(checkSufficientExceptionsHappend,
                    retryWait=1, timeout=timeout))
 
-    reqId = str(req.reqId)
+    reqId = str(json.loads(nym_request)['reqId'])
     assert any(reqId in record.getMessage() for record in logsPropagate)
     assert any(reqId in record.getMessage() for record in logsOrdered)
     assert any(reqId in record.getMessage() for record in logsCommitFail)

plenum/test/node_request/test_different_ledger_request_interleave.py

@@ -70,7 +70,7 @@ def test_different_ledger_request_interleave(tconf, looper, txnPoolNodeSet,
     sigseed, verkey, bls_key, nodeIp, nodePort, clientIp, clientPort = \
         prepare_new_node_data(tconf, tdir, next_node_name)
     node_req = looper.loop.run_until_complete(
-        prepare_node_request(next_node_name, steward_did, clientIp,
+        prepare_node_request(steward_did, next_node_name, clientIp,
                              clientPort, nodeIp, nodePort, bls_key,
                              sigseed))
 

plenum/test/pool_transactions/conftest.py

@@ -92,8 +92,7 @@ def sdk_node_theta_added(looper,
                                      new_node_name,
                                      tdir,
                                      tconf,
-                                     allPluginsPath,
-                                     nodeClass=testNodeClass)
+                                     allPluginsPath)
     txnPoolNodeSet.append(new_node)
     looper.run(checkNodesConnected(txnPoolNodeSet))
     sdk_pool_refresh(looper, sdk_pool_handle)