Skip to content

Jsonpickle version #656

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.

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

Merged
merged 3 commits into from
Apr 26, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions build-scripts/ubuntu-1604/build-3rd-parties.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,6 @@ build_from_pypi leveldb 0.194
build_from_pypi psutil 5.4.3
build_from_pypi pyzmq 17.0.0
build_from_pypi intervaltree 2.1.0
build_from_pypi jsonpickle 0.9.6
# TODO: add libsnappy dependency for python-rocksdb package
build_from_pypi python-rocksdb 0.6.9
16 changes: 9 additions & 7 deletions plenum/test/client/test_faulty_client_with_faulty_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,21 @@


@pytest.fixture(scope="module")
def nodeChangesRequest(txnPoolNodeSet):
alpha = txnPoolNodeSet[0]
def txnPoolNodeSet(txnPoolNodeSet):
delta = txnPoolNodeSet[-1]
assert not delta.master_replica.isPrimary

# Alpha should not be blacklisted for Invalid Signature by all other nodes
whitelistNode(alpha.name,
[node for node in txnPoolNodeSet if node != alpha],
whitelistNode(delta.name,
[node for node in txnPoolNodeSet if node != delta],
InvalidSignature.code)
makeNodeFaulty(alpha, changesRequest, )
for node in txnPoolNodeSet[3:]: node.clientstack.stop()
makeNodeFaulty(delta, changesRequest, )
txnPoolNodeSet[2].clientstack.stop()
return txnPoolNodeSet


# noinspection PyIncorrectDocstring,PyUnusedLocal,PyShadowingNames
def testReplyUnaffectedByFaultyNode(looper, txnPoolNodeSet, nodeChangesRequest,
def testReplyUnaffectedByFaultyNode(looper,
replied1):
"""
Client is malicious - sends requests to Alpha and Beta only
Expand Down
2 changes: 1 addition & 1 deletion plenum/test/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
checkNodesConnected, ensureElectionsDone, genNodeReg
from plenum.common.config_helper import PConfigHelper, PNodeConfigHelper

Logger.setLogLevel(logging.NOTSET)
Logger.setLogLevel(logging.INFO)
logger = getlogger()

GENERAL_CONFIG_DIR = 'etc/indy'
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
'': ['*.txt', '*.md', '*.rst', '*.json', '*.conf', '*.html',
'*.css', '*.ico', '*.png', 'LICENSE', 'LEGAL', 'plenum']},
include_package_data=True,
install_requires=['jsonpickle==0.9.2', 'ujson==1.33',
install_requires=['jsonpickle==0.9.6', 'ujson==1.33',
'prompt_toolkit==0.57', 'pygments==2.1',
'rlp==0.5.1', 'sha3==0.2.1', 'leveldb==0.194',
'ioflo==1.5.4', 'semver==2.7.9', 'base58==0.2.4', 'orderedset==2.0',
Expand Down