From e98174ba02f18ce25aa34491393bf6ba3fbed258 Mon Sep 17 00:00:00 2001 From: ashcherbakov Date: Tue, 29 Oct 2019 20:40:13 +0300 Subject: [PATCH 1/3] bump node Signed-off-by: ashcherbakov --- devops/Makefile | 2 +- sovtoken/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/Makefile b/devops/Makefile index 599ceda8..f49d21b6 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.11.0~dev1120) +FPM_P_DEPENDS := indy-node(=1.11.0~dev1122) FPM_ARGS := --no-python-dependencies $(FPM_ARGS) endif diff --git a/sovtoken/setup.py b/sovtoken/setup.py index b3bf313c..8db47af5 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.11.0.dev1120'], + install_requires=['indy-node==1.11.0.dev1122'], setup_requires=['pytest-runner'], extras_require={ From f6104c96c31b455a90da5e672dd002abb57d6d5c Mon Sep 17 00:00:00 2001 From: ashcherbakov Date: Tue, 29 Oct 2019 21:47:20 +0300 Subject: [PATCH 2/3] fix test imports Signed-off-by: ashcherbakov --- sovtoken/sovtoken/test/conftest.py | 1 + sovtokenfees/sovtokenfees/test/conftest.py | 1 + 2 files changed, 2 insertions(+) diff --git a/sovtoken/sovtoken/test/conftest.py b/sovtoken/sovtoken/test/conftest.py index b0a62f60..12fca3c1 100644 --- a/sovtoken/sovtoken/test/conftest.py +++ b/sovtoken/sovtoken/test/conftest.py @@ -11,6 +11,7 @@ from plenum.test.conftest import get_data_for_role, get_payload_data from sovtoken.test.helper import send_get_utxo, send_xfer from sovtoken.test.helpers import form_helpers, libloader +from indy_common.test.conftest import tconf as _tconf from indy_node.test.conftest import * from indy.did import create_and_store_my_did from indy.ledger import build_nym_request, sign_and_submit_request diff --git a/sovtokenfees/sovtokenfees/test/conftest.py b/sovtokenfees/sovtokenfees/test/conftest.py index 8a852ad5..2d2f8b8e 100644 --- a/sovtokenfees/sovtokenfees/test/conftest.py +++ b/sovtokenfees/sovtokenfees/test/conftest.py @@ -15,6 +15,7 @@ from sovtoken.test.conftest import sdk_trustees, sdk_stewards # fixtures, do not remove +from indy_common.test.conftest import tconf as _tconf from indy_node.test.conftest import * from sovtoken.constants import ( From 5f5eff3cc8322078ea678cb4d6e8e165853f5f53 Mon Sep 17 00:00:00 2001 From: ashcherbakov Date: Tue, 29 Oct 2019 23:34:22 +0300 Subject: [PATCH 3/3] fix tests Signed-off-by: ashcherbakov --- sovtoken/sovtoken/test/conftest.py | 11 +++++++++++ sovtokenfees/sovtokenfees/test/conftest.py | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/sovtoken/sovtoken/test/conftest.py b/sovtoken/sovtoken/test/conftest.py index 12fca3c1..2f178a32 100644 --- a/sovtoken/sovtoken/test/conftest.py +++ b/sovtoken/sovtoken/test/conftest.py @@ -36,6 +36,17 @@ def build_wallets_from_data(name_seeds): return wallets +@pytest.fixture(scope="module") +def tconf(_tconf): + oldMax3PCBatchSize = _tconf.Max3PCBatchSize + oldMax3PCBatchWait = _tconf.Max3PCBatchWait + _tconf.Max3PCBatchSize = 1000 + _tconf.Max3PCBatchWait = 1 + yield _tconf + _tconf.Max3PCBatchSize = oldMax3PCBatchSize + _tconf.Max3PCBatchWait = oldMax3PCBatchWait + + @pytest.fixture(scope="module") def SF_token_wallet(): return TokenWallet('SF_MASTER') diff --git a/sovtokenfees/sovtokenfees/test/conftest.py b/sovtokenfees/sovtokenfees/test/conftest.py index 2d2f8b8e..16b1c5dd 100644 --- a/sovtokenfees/sovtokenfees/test/conftest.py +++ b/sovtokenfees/sovtokenfees/test/conftest.py @@ -89,6 +89,17 @@ def __call__(self, *args, **kwargs): # ###################### +@pytest.fixture(scope="module") +def tconf(_tconf): + oldMax3PCBatchSize = _tconf.Max3PCBatchSize + oldMax3PCBatchWait = _tconf.Max3PCBatchWait + _tconf.Max3PCBatchSize = 1000 + _tconf.Max3PCBatchWait = 1 + yield _tconf + _tconf.Max3PCBatchSize = oldMax3PCBatchSize + _tconf.Max3PCBatchWait = oldMax3PCBatchWait + + @pytest.fixture(scope="module") def fees(request): default_fees = {