Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump node #340

Merged
merged 3 commits into from
Oct 30, 2019
Merged

bump node #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e98174b
bump node
ashcherbakov Oct 29, 2019
f6104c9
fix test imports
ashcherbakov Oct 29, 2019
5f5eff3
fix tests
ashcherbakov Oct 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion devops/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion sovtoken/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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={
Expand Down
12 changes: 12 additions & 0 deletions sovtoken/sovtoken/test/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -35,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')
Expand Down
12 changes: 12 additions & 0 deletions sovtokenfees/sovtokenfees/test/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -88,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 = {
Expand Down