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

Jump to bottom

Update eth-utils dependencies and clean up other dependencies #1195

Merged
merged 4 commits into from
Jan 10, 2019
Merged

Update eth-utils dependencies and clean up other dependencies #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a5d2d2
Update eth-utils dependencies and clean up other dependencies
pipermerriam Jan 9, 2019
d1707b8
Update eth-utils and pytest dependencies
njgheorghita Jan 10, 2019
952d4af
Update keyerror -> validationerror for mismatched from address in tests
njgheorghita Jan 10, 2019
d32c23b
Update eth-tester to 0.1.0b36
njgheorghita Jan 10, 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 docs/examples.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ contract which conforms to this standard.
assert alice == '0x7E5F4552091A69125d5DfCb7b8C2659029395Bdf', alice
assert bob == '0x2B5AD5c4795c026514f8317c7a215E218DcCD6cF', bob
tx_hash = factory.constructor(1000000).transact({'from': alice})
assert tx_hash == b",s\x8c\x1a\xc5\x8d\x1c\x8co\x00\x8d\xbeN\xe9fx\xe8a\xfdT\rL\xa6\xb4&\xef\x8c\xab\x1b\x1a'z", tx_hash
assert tx_hash == b'h9\xeb\xdb4\x07\x03y\x92RP`X\xf6\xf7\x9f\xfaT\xed&e\xee*\xc2\rx\xb3\xab\x8c4\xc9\x1f', tx_hash
txn_receipt = w3.eth.waitForTransactionReceipt(tx_hash)
assert txn_receipt['contractAddress'] == '0xF2E246BB76DF876Cef8b38ae84130F4F55De395b', txn_receipt['contractAddress']
contract_address = txn_receipt['contractAddress']
Expand Down
14 changes: 5 additions & 9 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

extras_require = {
'tester': [
"eth-tester[py-evm]==0.1.0-beta.33",
"eth-tester[py-evm]==0.1.0-beta.36",
"py-geth>=2.0.1,<3.0.0",
],
'testrpc': ["eth-testrpc>=1.3.3,<2.0.0"],
Expand All @@ -21,12 +21,10 @@
"click>=5.1",
"configparser==3.5.0",
"contextlib2>=0.5.4",
#"eth-testrpc>=0.8.0",
#"ethereum-tester-client>=1.1.0",
"ethtoken",
"py-geth>=1.4.0",
"py-solc>=0.4.0",
"pytest>=2.7.2",
"pytest>=3.5.0,<4.0.0",
"sphinx",
"sphinx_rtd_theme>=0.1.9",
"toposort>=1.4",
Expand All @@ -38,7 +36,7 @@
"bumpversion",
"flaky>=3.3.0",
"hypothesis>=3.31.2",
"pytest>=3.5.0,<4",
"pytest>=3.6.0,<4.0.0",
"pytest-mock==1.*",
"pytest-pythonpath>=0.3",
"pytest-watch==4.*",
Expand Down Expand Up @@ -69,11 +67,9 @@
url='https://github.com/ethereum/web3.py',
include_package_data=True,
install_requires=[
"toolz>=0.9.0,<1.0.0;implementation_name=='pypy'",
"cytoolz>=0.9.0,<1.0.0;implementation_name=='cpython'",
"eth-abi>=2.0.0a1,<3.0.0",
"eth-abi>=2.0.0b4,<3.0.0",
"eth-account>=0.2.1,<0.4.0",
"eth-utils>=1.2.0,<2.0.0",
"eth-utils>=1.3.0,<2.0.0",
"hexbytes>=0.1.0,<1.0.0",
"lru-dict>=1.1.6,<2.0.0",
"eth-hash[pycryptodome]>=0.2.0,<1.0.0",
Expand Down
7 changes: 5 additions & 2 deletions tests/core/middleware/test_transaction_signing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

import eth_account
import eth_keys
from eth_tester.exceptions import (
ValidationError,
)
from eth_utils import (
to_bytes,
to_hex,
Expand Down Expand Up @@ -231,12 +234,12 @@ def fund_account(w3):
),
(
# Transaction with mismatched sender
# expect a key error with sendTransaction + unmanaged account
# expect a validation error with sendTransaction + unmanaged account
{
'gas': 21000,
'value': 10
},
KeyError,
ValidationError,
SAME_KEY_MIXED_TYPE,
ADDRESS_2,
),
Expand Down