Merge pull request #252 from ArtObr/rc-0.9.13

anikitinDSR · web-flow · commit 8a00a8e6a15a · 2019-06-06T11:08:03.000+03:00
[RC-0.9.13] Release candidate 0.9.13
diff --git a/devops/Makefile b/devops/Makefile
@@ -53,7 +53,7 @@ ifeq ($(SRC_DIR_NAME),sovtoken)
 # 	pypi: indy-plenum
 # 	apt: indy-plenum (stable component)
 
-FPM_P_DEPENDS := indy-node(=1.8.0)
+FPM_P_DEPENDS := indy-node(=1.8.1)
 FPM_ARGS := --no-python-dependencies $(FPM_ARGS)
 endif
 
diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci
@@ -90,19 +90,23 @@ pipelineWrapper({
                                 [name: 'OSNAME', value: osname],
                                 [name: 'MAKE_GOALS', value: goals.join(' ')],
                                 [name: 'SRC_DIR_NAME', value: proj],
-                                // ST-548
-                                //[name: 'PYTEST_ARGS', value: "-l --junit-xml=/tmp/artifacts/logs/test.${proj}.xml"],
-                                [name: 'PYTEST_ARGS', value: "-l"],
+                                [name: 'PYTEST_ARGS', value: "-l -v --junit-xml=/tmp/artifacts/logs/test.${proj}.xml"],
                             ]
 
                             onArtifacts = {
                                 this.stage("$osname:$proj: Archive artifacts") {
+                                    this.sh "ls -la logs/* || true"
+
                                     utils.archiveArtifacts("logs/*.log*") {
                                         truncate = true
                                         allowEmptyArchive = true
                                     }
 
-                                    // this.junit "logs/test.${proj}.xml"
+                                    try {
+                                        this.junit "logs/test.${proj}.xml"
+                                    } catch (ex) {
+                                        logger.warn("Failed to create jUnit report: $ciImageTag")
+                                    }
                                 }
                             }
                         }
diff --git a/devops/docker/ci/xenial/Dockerfile b/devops/docker/ci/xenial/Dockerfile
@@ -25,7 +25,7 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 \
 RUN add-apt-repository "deb https://repo.sovrin.org/sdk/deb xenial master" \
     && apt-get update && apt-get install -y \
         libindy-crypto=0.4.5 \
-        libindy=1.8.3~1099 \
+        libindy=1.9.0~1122 \
         libsovtoken=0.9.7~66 \
     && rm -rf /var/lib/apt/lists/*
 
@@ -44,4 +44,4 @@ RUN if [ "$u_id" != "0" ]; then \
 USER $u_id
 
 # TODO CMD ENTRYPOINT ...
-ENV CI_ENV_VERSION=0.17.0
+ENV CI_ENV_VERSION=0.18.0
diff --git a/sovtoken/pytest.ini b/sovtoken/pytest.ini
@@ -0,0 +1,3 @@
+[pytest]
+junit_logging=system-err
+junit_log_passing_tests=False
diff --git a/sovtoken/setup.py b/sovtoken/setup.py
@@ -19,7 +19,7 @@
 with open(os.path.join(here, 'sovtoken', '__metadata__.py'), 'r') as f:
     exec(f.read(), metadata)
 
-tests_require = ['pytest', 'pytest-xdist', 'mock', 'python3-indy==1.8.3-dev-1099']
+tests_require = ['pytest>=4.6.1', 'pytest-xdist', 'mock', 'python3-indy==1.9.0-dev-1122']
 
 setup(
     name=metadata['__title__'],
@@ -38,7 +38,7 @@
              '*.css', '*.ico', '*.png', 'LICENSE', 'LEGAL', 'sovtoken']},
     include_package_data=True,
 
-    install_requires=['indy-node==1.8.0'],
+    install_requires=['indy-node==1.8.1'],
 
     setup_requires=['pytest-runner'],
     extras_require={
diff --git a/sovtoken/sovtoken/__metadata__.py b/sovtoken/sovtoken/__metadata__.py
@@ -4,7 +4,7 @@
 
 # TODO: Update the field values below where needed
 __title__ = 'sovtoken'
-__version_info__ = (0, 9, 12)
+__version_info__ = (0, 9, 13)
 __version__ = '.'.join(map(str, __version_info__))
 __description__ = 'Token Plugin For Indy Plenum'
 __long_description__ = ''
diff --git a/sovtoken/sovtoken/test/helpers/helper_request.py b/sovtoken/sovtoken/test/helpers/helper_request.py
@@ -2,7 +2,7 @@
 import time
 
 from indy.ledger import build_nym_request, build_schema_request, \
-    build_acceptance_mechanism_request, build_txn_author_agreement_request, \
+    build_acceptance_mechanisms_request, build_txn_author_agreement_request, \
     build_get_txn_author_agreement_request, append_txn_author_agreement_acceptance_to_request
 from indy.payment import build_get_payment_sources_request, build_payment_req, build_mint_req, \
     prepare_payment_extra_with_acceptance_data
@@ -162,7 +162,7 @@ def schema(
         return request
 
     def acceptance_mechanism(self, sdk_trustee_wallet, aml, aml_context=None):
-        acceptance_mechanism_future = build_acceptance_mechanism_request(sdk_trustee_wallet[1], aml, "0.0.1", aml_context)
+        acceptance_mechanism_future = build_acceptance_mechanisms_request(sdk_trustee_wallet[1], aml, "0.0.1", aml_context)
         acceptance_mechanism_request = self._looper.loop.run_until_complete(acceptance_mechanism_future)
         acceptance_mechanism_request = self._sdk.sdk_json_to_request_object(json.loads(acceptance_mechanism_request))
         acceptance_mechanism_request = self._sign_sdk(acceptance_mechanism_request, sdk_trustee_wallet)
diff --git a/sovtoken/sovtoken/test/test_wallet.py b/sovtoken/sovtoken/test/test_wallet.py
@@ -287,4 +287,4 @@ def test_token_wallet_get_val_null(test_wallet, address0):
 def test_token_wallet_get_val_invalid_address(test_wallet):
     address0_not_in_wallet = Address()
     with pytest.raises(KeyError):
-        val = test_wallet.get_val(address0_not_in_wallet, 1)
+        val = test_wallet.get_val(address0_not_in_wallet, 1)
diff --git a/sovtokenfees/pytest.ini b/sovtokenfees/pytest.ini
@@ -0,0 +1,3 @@
+[pytest]
+junit_logging=system-err
+junit_log_passing_tests=False
diff --git a/sovtokenfees/setup.py b/sovtokenfees/setup.py
@@ -18,7 +18,7 @@
 with open(os.path.join(here, 'sovtokenfees', '__metadata__.py'), 'r') as f:
     exec(f.read(), metadata)
 
-tests_require = ['pytest', 'pytest-xdist', 'python3-indy==1.8.3-dev-1099']
+tests_require = ['pytest>=4.6.1', 'pytest-xdist', 'python3-indy==1.9.0-dev-1122']
 
 setup(
 
diff --git a/sovtokenfees/sovtokenfees/__metadata__.py b/sovtokenfees/sovtokenfees/__metadata__.py
@@ -9,7 +9,7 @@
 __maintainer__ = 'Sovrin'
 __title__ = 'sovtokenfees'
 __url__ = 'https://github.com/sovrin-foundation/token-plugin/tree/master/sovtokenfees'
-__version_info__ = (0, 9, 12)
+__version_info__ = (0, 9, 13)
 __version__ = '.'.join(map(str, __version_info__))
 
 __all__ = ['__title__',
diff --git a/sovtokenfees/sovtokenfees/test/test_request_digest_with_fees.py b/sovtokenfees/sovtokenfees/test/test_request_digest_with_fees.py
@@ -0,0 +1,56 @@
+import copy
+import json
+
+import pytest
+from plenum.test.pool_transactions.helper import prepare_nym_request
+from sovtokenfees.test.helper import nyms_with_fees, get_amount_from_token_txn
+
+from plenum.common.exceptions import RequestNackedException
+from plenum.common.util import randomString
+
+from plenum.test.helper import sdk_get_and_check_replies, sdk_sign_request_objects, \
+    sdk_json_to_request_object
+
+
+@pytest.fixture(scope='function')
+def two_requests(looper, helpers,
+                 nodeSetWithIntegratedTokenPlugin,
+                 sdk_pool_handle,
+                 fees_set, address_main, mint_tokens, sdk_wallet_steward):
+    amount = get_amount_from_token_txn(mint_tokens)
+    init_seq_no = 1
+
+    seed = randomString(32)
+    alias = randomString(5)
+    wh, _ = sdk_wallet_steward
+    nym_request, new_did = looper.loop.run_until_complete(
+        prepare_nym_request(sdk_wallet_steward, seed,
+                            alias, None))
+    nym_request = \
+        sdk_sign_request_objects(looper, sdk_wallet_steward, [sdk_json_to_request_object(json.loads(nym_request))])[0]
+    req_obj = sdk_json_to_request_object(json.loads(nym_request))
+    helpers.request.nym = lambda: copy.deepcopy(req_obj)
+
+    req1, req2 = nyms_with_fees(2,
+                                helpers,
+                                fees_set,
+                                address_main,
+                                amount,
+                                init_seq_no=init_seq_no)
+
+    assert req1.payload_digest == req2.payload_digest
+    assert req1.digest != req2.digest
+    return req1, req2
+
+
+def test_send_same_txn_with_different_fees(helpers, looper, nodeSetWithIntegratedTokenPlugin,
+                                           sdk_pool_handle, two_requests):
+    req1, req2 = two_requests
+
+    resp = helpers.sdk.send_request_objects([req1], )
+    sdk_get_and_check_replies(looper, resp)
+
+    resp = helpers.sdk.send_request_objects([req2])
+    with pytest.raises(RequestNackedException) as e:
+        sdk_get_and_check_replies(looper, resp)
+    e.match('Same txn was already ordered with different signatures or pluggable fields')

Original file line number	Diff line number	Diff line change
`@@ -90,19 +90,23 @@ pipelineWrapper({`
`90`	`90`	`[name: 'OSNAME', value: osname],`
`91`	`91`	`[name: 'MAKE_GOALS', value: goals.join(' ')],`
`92`	`92`	`[name: 'SRC_DIR_NAME', value: proj],`
`93`		`- // ST-548`
`94`		`- //[name: 'PYTEST_ARGS', value: "-l --junit-xml=/tmp/artifacts/logs/test.${proj}.xml"],`
`95`		`- [name: 'PYTEST_ARGS', value: "-l"],`
	`93`	`+ [name: 'PYTEST_ARGS', value: "-l -v --junit-xml=/tmp/artifacts/logs/test.${proj}.xml"],`
`96`	`94`	`]`
`97`	`95`
`98`	`96`	`onArtifacts = {`
`99`	`97`	`this.stage("$osname:$proj: Archive artifacts") {`
	`98`	`+ this.sh "ls -la logs/* \|\| true"`
	`99`	`+`
`100`	`100`	`utils.archiveArtifacts("logs/.log") {`
`101`	`101`	`truncate = true`
`102`	`102`	`allowEmptyArchive = true`
`103`	`103`	`}`
`104`	`104`
`105`		`- // this.junit "logs/test.${proj}.xml"`
	`105`	`+ try {`
	`106`	`+ this.junit "logs/test.${proj}.xml"`
	`107`	`+ } catch (ex) {`
	`108`	`+ logger.warn("Failed to create jUnit report: $ciImageTag")`
	`109`	`+ }`
`106`	`110`	`}`
`107`	`111`	`}`
`108`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[pytest]`
	`2`	`+junit_logging=system-err`
	`3`	`+junit_log_passing_tests=False`