Merge branch 'master' of github.com:hyperledger/indy-node into imrove…

…s-nightly-builds-logs

ci/ubuntu.dockerfile

@@ -8,7 +8,7 @@ ARG venv=venv
 RUN apt-get update -y && apt-get install -y \
     python3-nacl \
     libindy-crypto=0.4.5 \
-    libindy=1.10.0~1167 \
+    libindy=1.10.0~1191 \
 # rocksdb python wrapper
     libbz2-dev \
     zlib1g-dev \

indy_node/test/auth_rule/auth_framework/test_auth_rule_using.py

@@ -193,6 +193,7 @@ def auth_rule_tests(self, request, env):
         test = test_cls(env, action_id)
         return action_id, test
 
+    @pytest.mark.skip("Waiting libindy fix for sending constraints with an IDENTITY_OWNER role.")
     def test_auth_rule_using(self, auth_rule_tests):
         descr, test = auth_rule_tests
         print("Running test: {}".format(descr))

indy_node/test/state_proof/test_state_proof_for_get_requests.py

@@ -306,8 +306,8 @@ def test_state_proof_returned_for_get_revoc_reg_delta(looper,
     # check_get_delta(looper, sdk_wallet_client, sdk_wallet_steward, revoc_reg_def, timestamp - 2, timestamp - 1,
     #                 sdk_pool_handle, revoc_reg_entry_data, False)
 
-    check_get_delta(looper, sdk_wallet_client, sdk_wallet_steward, revoc_reg_def, timestamp - 1, timestamp + 1,
-                    sdk_pool_handle, revoc_reg_entry_data)
+    # check_get_delta(looper, sdk_wallet_client, sdk_wallet_steward, revoc_reg_def, timestamp - 1, timestamp + 1,
+    #                 sdk_pool_handle, revoc_reg_entry_data)
 
     check_get_delta(looper, sdk_wallet_client, sdk_wallet_steward, revoc_reg_def, timestamp + 1, timestamp + 2,
                     sdk_pool_handle, revoc_reg_entry_data)

indy_node/test/upgrade/test_node_sustain_invalid_upgrade_txn.py

@@ -0,0 +1,31 @@
+import pytest
+
+from indy_node.test.upgrade.conftest import EXT_PKT_NAME, EXT_PKT_VERSION
+from plenum.common.exceptions import RequestNackedException
+from plenum.test.pool_transactions.helper import sdk_add_new_nym
+
+from indy_node.test.upgrade.helper import sdk_ensure_upgrade_sent
+
+
+@pytest.fixture
+def pckg(request):
+    return EXT_PKT_NAME, EXT_PKT_VERSION
+
+
+def test_forced_request_validation(looper, txnPoolNodeSet,
+                                   sdk_pool_handle, sdk_wallet_steward,
+                                   sdk_wallet_trustee, validUpgradeExpForceTrue):
+    for node in txnPoolNodeSet[2:]:
+        node.upgrader.check_upgrade_possible = lambda a, b, c: None
+    for node in txnPoolNodeSet[:2]:
+        node.upgrader.check_upgrade_possible = lambda a, b, c: 'some exception'
+
+    assert all(n.spylog.getAll('processPropagate') == [] for n in txnPoolNodeSet)
+
+    with pytest.raises(RequestNackedException, match='some exception'):
+        sdk_ensure_upgrade_sent(looper, sdk_pool_handle, sdk_wallet_trustee, validUpgradeExpForceTrue)
+
+    assert all(len(n.spylog.getAll('processPropagate')) == 2 for n in txnPoolNodeSet[:2])
+    assert all(len(n.spylog.getAll('processPropagate')) == 1 for n in txnPoolNodeSet[2:])
+
+    sdk_add_new_nym(looper, sdk_pool_handle, sdk_wallet_steward)

setup.py

@@ -27,7 +27,7 @@
 
 BASE_DIR = os.path.join(os.path.expanduser("~"), ".indy")
 
-tests_require = ['pytest==3.3.1', 'pytest-xdist==1.22.1', 'python3-indy==1.10.0-dev-1167', 'pytest-asyncio==0.8.0']
+tests_require = ['pytest==3.3.1', 'pytest-xdist==1.22.1', 'python3-indy==1.10.0-dev-1191', 'pytest-asyncio==0.8.0']
 
 setup(
     name=metadata['__title__'],
@@ -50,7 +50,7 @@
     data_files=[(
         (BASE_DIR, ['data/nssm_original.exe'])
     )],
-    install_requires=['indy-plenum==1.9.0.dev847',
+    install_requires=['indy-plenum==1.9.0.dev849',
                       'python-dateutil',
                       'timeout-decorator==0.4.0',
                       'distro==1.3.0'],