From 7c51aad360d0d3c6737604acefd702f89caccc2a Mon Sep 17 00:00:00 2001 From: Andrew Nikitin Date: Wed, 29 May 2019 13:40:14 +0300 Subject: [PATCH 01/12] [BUMP_NODE] bump indy-node version Signed-off-by: Andrew Nikitin --- devops/Makefile | 2 +- sovtoken/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/Makefile b/devops/Makefile index 54ee9994..8d5efcae 100644 --- 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~dev975) +FPM_P_DEPENDS := indy-node(=1.8.0~dev981) FPM_ARGS := --no-python-dependencies $(FPM_ARGS) endif diff --git a/sovtoken/setup.py b/sovtoken/setup.py index a0878d0b..8cefbd57 100644 --- a/sovtoken/setup.py +++ b/sovtoken/setup.py @@ -38,7 +38,7 @@ '*.css', '*.ico', '*.png', 'LICENSE', 'LEGAL', 'sovtoken']}, include_package_data=True, - install_requires=['indy-node==1.8.0.dev975'], + install_requires=['indy-node==1.8.0.dev981'], setup_requires=['pytest-runner'], extras_require={ From 94384636da01f64ff646930e04b0923a2ba30052 Mon Sep 17 00:00:00 2001 From: ArtObr Date: Mon, 3 Jun 2019 14:21:55 +0300 Subject: [PATCH 02/12] ST-399: Test to check fees digest consistency Signed-off-by: ArtObr --- .../test/test_request_digest_with_fees.py | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 sovtokenfees/sovtokenfees/test/test_request_digest_with_fees.py diff --git a/sovtokenfees/sovtokenfees/test/test_request_digest_with_fees.py b/sovtokenfees/sovtokenfees/test/test_request_digest_with_fees.py new file mode 100644 index 00000000..a320f5d8 --- /dev/null +++ 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') From 1128bad541d6216a3e8e5e88b3f7f792609796a8 Mon Sep 17 00:00:00 2001 From: ArtObr Date: Mon, 3 Jun 2019 14:26:32 +0300 Subject: [PATCH 03/12] SDK function renaming Signed-off-by: ArtObr --- sovtoken/sovtoken/test/helpers/helper_request.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sovtoken/sovtoken/test/helpers/helper_request.py b/sovtoken/sovtoken/test/helpers/helper_request.py index f7620802..6e60fd60 100644 --- 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) From 7b187d60b5cd641db8d82564fc1b9552926e0fa9 Mon Sep 17 00:00:00 2001 From: toktar Date: Mon, 3 Jun 2019 15:33:06 +0300 Subject: [PATCH 04/12] Bump node and plugins version Signed-off-by: toktar --- devops/Makefile | 2 +- sovtoken/setup.py | 2 +- sovtoken/sovtoken/__metadata__.py | 2 +- sovtokenfees/sovtokenfees/__metadata__.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devops/Makefile b/devops/Makefile index 8d5efcae..b5e31ecd 100644 --- 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~dev981) +FPM_P_DEPENDS := indy-node(=1.9.0~dev985) FPM_ARGS := --no-python-dependencies $(FPM_ARGS) endif diff --git a/sovtoken/setup.py b/sovtoken/setup.py index 8cefbd57..ab448b10 100644 --- a/sovtoken/setup.py +++ b/sovtoken/setup.py @@ -38,7 +38,7 @@ '*.css', '*.ico', '*.png', 'LICENSE', 'LEGAL', 'sovtoken']}, include_package_data=True, - install_requires=['indy-node==1.8.0.dev981'], + install_requires=['indy-node==1.9.0.dev985'], setup_requires=['pytest-runner'], extras_require={ diff --git a/sovtoken/sovtoken/__metadata__.py b/sovtoken/sovtoken/__metadata__.py index a77688f1..103252ce 100644 --- 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/sovtokenfees/sovtokenfees/__metadata__.py b/sovtokenfees/sovtokenfees/__metadata__.py index a55cfc56..c5362a62 100644 --- 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__', From 256f10f5a417af7366a11306c82189be67963a91 Mon Sep 17 00:00:00 2001 From: Andrey Kononykhin Date: Fri, 31 May 2019 16:46:04 +0300 Subject: [PATCH 05/12] enables junit reports without publishing Signed-off-by: Andrey Kononykhin --- devops/aws-codebuild/Jenkinsfile.ci | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci index dad2eb30..96443488 100644 --- a/devops/aws-codebuild/Jenkinsfile.ci +++ b/devops/aws-codebuild/Jenkinsfile.ci @@ -90,18 +90,18 @@ 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 } - + // ST-548 // this.junit "logs/test.${proj}.xml" } } From adec1a828e729f3867e670cc9e2d8dbcd5dc0808 Mon Sep 17 00:00:00 2001 From: Andrey Kononykhin Date: Mon, 3 Jun 2019 19:39:30 +0300 Subject: [PATCH 06/12] configures pytest to log only failed tests to junit report Signed-off-by: Andrey Kononykhin --- sovtoken/pytest.ini | 3 +++ sovtoken/setup.py | 2 +- sovtoken/sovtoken/test/test_wallet.py | 2 +- sovtokenfees/pytest.ini | 3 +++ sovtokenfees/setup.py | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 sovtoken/pytest.ini create mode 100644 sovtokenfees/pytest.ini diff --git a/sovtoken/pytest.ini b/sovtoken/pytest.ini new file mode 100644 index 00000000..0f3eac87 --- /dev/null +++ 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 index ab448b10..ed2e5320 100644 --- 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.8.3-dev-1099'] setup( name=metadata['__title__'], diff --git a/sovtoken/sovtoken/test/test_wallet.py b/sovtoken/sovtoken/test/test_wallet.py index 03cce7cb..a41aa39f 100644 --- 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) \ No newline at end of file + val = test_wallet.get_val(address0_not_in_wallet, 1) diff --git a/sovtokenfees/pytest.ini b/sovtokenfees/pytest.ini new file mode 100644 index 00000000..0f3eac87 --- /dev/null +++ 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 index c2385827..06d462b5 100644 --- 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.8.3-dev-1099'] setup( From e597d023257ca8c2b1b16dc039d097047cd8d04d Mon Sep 17 00:00:00 2001 From: Andrey Kononykhin Date: Mon, 3 Jun 2019 19:43:14 +0300 Subject: [PATCH 07/12] enables junit logging Signed-off-by: Andrey Kononykhin --- devops/aws-codebuild/Jenkinsfile.ci | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci index 96443488..684545d1 100644 --- a/devops/aws-codebuild/Jenkinsfile.ci +++ b/devops/aws-codebuild/Jenkinsfile.ci @@ -101,8 +101,12 @@ pipelineWrapper({ truncate = true allowEmptyArchive = true } - // ST-548 - // this.junit "logs/test.${proj}.xml" + + try { + this.junit "logs/test.${proj}.xml" + } catch (ex) { + logger.warn("Failed to create jUnit report: $ciImageTag") + } } } } From a6ac199fbaea32192b18109328444c34e9b14956 Mon Sep 17 00:00:00 2001 From: ArtObr Date: Tue, 4 Jun 2019 18:56:03 +0300 Subject: [PATCH 08/12] Bump indy-node 1.9.0~1099 Signed-off-by: ArtObr --- devops/Makefile | 2 +- sovtoken/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/Makefile b/devops/Makefile index 8d5efcae..6b426860 100644 --- 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~dev981) +FPM_P_DEPENDS := indy-node(=1.9.0~dev987) FPM_ARGS := --no-python-dependencies $(FPM_ARGS) endif diff --git a/sovtoken/setup.py b/sovtoken/setup.py index 8cefbd57..d2f2ac57 100644 --- a/sovtoken/setup.py +++ b/sovtoken/setup.py @@ -38,7 +38,7 @@ '*.css', '*.ico', '*.png', 'LICENSE', 'LEGAL', 'sovtoken']}, include_package_data=True, - install_requires=['indy-node==1.8.0.dev981'], + install_requires=['indy-node==1.9.0.dev987'], setup_requires=['pytest-runner'], extras_require={ From 56c5cab1e41d2c817630ed4137ee865e645e18fb Mon Sep 17 00:00:00 2001 From: ArtObr Date: Tue, 4 Jun 2019 21:01:14 +0300 Subject: [PATCH 09/12] Bump libindy wrapper Signed-off-by: ArtObr --- sovtoken/setup.py | 2 +- sovtokenfees/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sovtoken/setup.py b/sovtoken/setup.py index 42079288..d5fe5f3f 100644 --- 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>=4.6.1', '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__'], diff --git a/sovtokenfees/setup.py b/sovtokenfees/setup.py index 06d462b5..ebe41995 100644 --- 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>=4.6.1', '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( From 334b38525cc3bf4c318dbaaeed531ed2fa183be9 Mon Sep 17 00:00:00 2001 From: ArtObr Date: Wed, 5 Jun 2019 01:07:43 +0300 Subject: [PATCH 10/12] Bump libindy Signed-off-by: ArtObr --- devops/docker/ci/xenial/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/docker/ci/xenial/Dockerfile b/devops/docker/ci/xenial/Dockerfile index cd40cb35..abb459cd 100644 --- 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/* From 949ea6eed16ae6e4eea5c77593f1cc386a406686 Mon Sep 17 00:00:00 2001 From: Andrew Nikitin Date: Wed, 5 Jun 2019 09:38:25 +0300 Subject: [PATCH 11/12] [ST-399] bump version of dockerfile Signed-off-by: Andrew Nikitin --- devops/docker/ci/xenial/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/docker/ci/xenial/Dockerfile b/devops/docker/ci/xenial/Dockerfile index abb459cd..7ae66c39 100644 --- a/devops/docker/ci/xenial/Dockerfile +++ b/devops/docker/ci/xenial/Dockerfile @@ -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 From a8fe04ba3ce314635aa5e8cf8810263b8036552d Mon Sep 17 00:00:00 2001 From: ArtObr Date: Thu, 6 Jun 2019 10:09:35 +0300 Subject: [PATCH 12/12] [RC-0.9.13] Release candidate 0.9.13 Signed-off-by: ArtObr --- devops/Makefile | 2 +- sovtoken/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/Makefile b/devops/Makefile index 2ed80516..03b79758 100644 --- 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/sovtoken/setup.py b/sovtoken/setup.py index 89ab9c75..c521262c 100644 --- a/sovtoken/setup.py +++ b/sovtoken/setup.py @@ -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={