Skip to content

Split test channel setup in two steps #1392

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

Merged
hackaugusto merged 8 commits into from
May 7, 2018
Merged

Split test channel setup in two steps #1392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b277bf6
Split channel setup in two steps
hackaugusto May 2, 2018
0c0131d
removed sender argument form send_transaction
hackaugusto May 2, 2018
03e2a92
removed unused method eth_sendTransaction
hackaugusto May 2, 2018
1318a8b
removed unused argument from deploy_solidity_contract
hackaugusto May 2, 2018
43e49cb
removed nonce argument from send_transaction
hackaugusto May 2, 2018
81f09a9
bugfix: nonce queried from server
hackaugusto May 3, 2018
3f69d43
simplified nonce logic
hackaugusto May 3, 2018
9867ccc
call -> rpccall_with_retry
hackaugusto May 3, 2018
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
4 changes: 3 additions & 1 deletion raiden/api/python.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,11 +268,13 @@ def channel_deposit(

# Wait until the `ChannelNewBalance` event is processed.
with gevent.Timeout(poll_timeout, EthNodeCommunicationError(msg)):
waiting.wait_for_newbalance(
target_address = self.raiden.address
waiting.wait_for_participant_newbalance(
self.raiden,
registry_address,
token_address,
partner_address,
target_address,
target_balance,
self.raiden.alarm.wait_time,
)
Expand Down
7 changes: 3 additions & 4 deletions raiden/network/blockchain_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def block_number(self) -> int:
return self.client.block_number()

def is_synced(self) -> bool:
result = self.client.call('eth_syncing')
result = self.client.rpccall_with_retry('eth_syncing')

# the node is synchronized
if result is False:
Expand Down Expand Up @@ -87,7 +87,7 @@ def estimate_blocktime(self, oldest: int = 256) -> float:

def get_block_header(self, block_number: int):
block_number = block_tag_encoder(block_number)
return self.client.call('eth_getBlockByNumber', block_number, False)
return self.client.rpccall_with_retry('eth_getBlockByNumber', block_number, False)

def next_block(self) -> int:
target_block_number = self.block_number() + 1
Expand Down Expand Up @@ -166,7 +166,7 @@ def registry(self, registry_address: bytes) -> Registry:
return self.address_to_registry[registry_address]

def uninstall_filter(self, filter_id_raw):
self.client.call('eth_uninstallFilter', filter_id_raw)
self.client.rpccall_with_retry('eth_uninstallFilter', filter_id_raw)

def deploy_contract(self, contract_name, contract_path, constructor_parameters=None):
contracts = _solidity.compile_file(contract_path, libraries=dict())
Expand All @@ -177,7 +177,6 @@ def deploy_contract(self, contract_name, contract_path, constructor_parameters=N
)

proxy = self.client.deploy_solidity_contract(
self.node_address,
contract_name,
contracts,
list(),
Expand Down
Loading