Merge remote-tracking branch 'origin/master' into file-struct

Author: Dmitry Surnin

ci/code-validation.dockerfile

@@ -4,8 +4,7 @@ FROM ubuntu:16.04
 ARG uid=1000
 
 # Install environment
-RUN apt-get update -y
-RUN apt-get install -y \ 
+RUN apt-get update -y && apt-get install -y \
 	git \
 	wget \
 	python3.5 \

plenum/client/client.py

@@ -192,6 +192,7 @@ def __init__(self,
         logger.debug("total plugins loaded in client: {}".format(tp))
 
         self._multi_sig_verifier = self._create_multi_sig_verifier()
+        self._read_only_requests = set()
 
     @lazy_field
     def _bls_register(self):
@@ -276,11 +277,14 @@ async def prod(self, limit) -> int:
     def submitReqs(self, *reqs: Request) -> List[Request]:
         requests = []
         errs = []
+
         for request in reqs:
-            if (self.mode == Mode.discovered and self.hasSufficientConnections) or (
-                    request.isForced() and self.hasAnyConnections):
-                logger.debug(
-                    'Client {} sending request {}'.format(self, request))
+            if (self.mode == Mode.discovered and self.hasSufficientConnections) or \
+               (self.hasAnyConnections and
+               (request.txn_type in self._read_only_requests or request.isForced())):
+
+                logger.debug('Client {} sending request {}'
+                             .format(self, request))
                 stat, err_msg = self.send(request)
                 if stat:
                     self.expectingFor(request)
@@ -292,7 +296,7 @@ def submitReqs(self, *reqs: Request) -> List[Request]:
             else:
                 logger.debug(
                     "{} pending request since in mode {} and "
-                    "connected to {} nodes". format(
+                    "connected to {} nodes".format(
                         self, self.mode, self.nodestack.connecteds))
                 self.pendReqsTillConnection(request)
             requests.append(request)

plenum/common/request.py

@@ -2,7 +2,7 @@
 from typing import Mapping, NamedTuple
 
 from common.serializers.serialization import serialize_msg_for_signing
-from plenum.common.constants import REQDIGEST, REQKEY, FORCE, CURRENT_PROTOCOL_VERSION
+from plenum.common.constants import REQDIGEST, REQKEY, FORCE, TXN_TYPE, CURRENT_PROTOCOL_VERSION
 from plenum.common.messages.client_request import ClientMessageValidator
 from plenum.common.types import f, OPERATION
 from stp_core.types import Identifier
@@ -87,6 +87,10 @@ def isForced(self):
         force = self.operation.get(FORCE)
         return str(force) == 'True'
 
+    @property
+    def txn_type(self):
+        return self.operation.get(TXN_TYPE)
+
     def __hash__(self):
         return hash(self.serialized())
 

plenum/test/client/test_client_sends_get_request_to_one_node.py

@@ -0,0 +1,47 @@
+import random
+
+from plenum.test.client.conftest import passThroughReqAcked1
+
+from plenum.test.helper import sendReqsToNodesAndVerifySuffReplies, stopNodes, waitForSufficientRepliesForRequests, \
+    send_signed_requests
+from plenum.test.malicious_behaviors_client import \
+    genDoesntSendRequestToSomeNodes
+from plenum.test.node_catchup.helper import waitNodeDataEquality
+
+
+nodeCount = 4
+clientFault = genDoesntSendRequestToSomeNodes("AlphaC")
+reqAcked1 = passThroughReqAcked1
+
+
+def test_client_sends_get_request_to_one_node(looper,
+                                              client1,
+                                              wallet1,
+                                              nodeSet):
+    """
+    Check that read only equest can be sent
+    without having connection to all nodes
+    """
+    client = client1
+    wallet = wallet1
+
+    nodes_to_stop = list(nodeSet)[1:]
+    stopNodes(nodes_to_stop, looper)
+
+    initial_submit_count = client.spylog.count(client.submitReqs)
+    initial_send_count = client.spylog.count(client.send)
+
+    def sign_and_send(op):
+        signed = wallet.signOp(op)
+        send_signed_requests(client, [signed])
+
+    buy = {'type': 'buy', 'amount': random.randint(10, 100)}
+    sign_and_send(buy)
+    assert initial_submit_count + 1 == client.spylog.count(client.submitReqs)
+    assert initial_send_count == client.spylog.count(client.send)
+
+    get_buy = {'type': 'get_buy'}
+    client._read_only_requests.add('get_buy')
+    sign_and_send(get_buy)
+    assert initial_submit_count + 2 == client.spylog.count(client.submitReqs)
+    assert initial_send_count + 1 == client.spylog.count(client.send)

plenum/test/test_client.py

@@ -21,7 +21,10 @@
 
 logger = getlogger()
 
-client_spyables = [Client.handleOneNodeMsg, Client.resendRequests]
+client_spyables = [Client.handleOneNodeMsg,
+                   Client.resendRequests,
+                   Client.send,
+                   Client.submitReqs]
 
 
 @spyable(methods=client_spyables)