crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change all instances of networkId to chainId (#2313)

Browse Source 
* abi-gen/test: recompile contract fixtures for 3.0

It seems this hadn't been done since the merge with the 3.0 branch.

* Sync `monorepo$ yarn test` exclusions to CI config

* sra-spec: correct typo

* contract-wrappers: TODO after coord.-server update

* utils: fix typo in comment

* Refactor networkId to chainId everywhere

* Update CHANGELOGs
This commit is contained in:
F. Eugene Aumson
2019-11-06 01:18:55 -05:00
committed by GitHub
parent e61f23d001
commit f51c80adb2
100 changed files with 5341 additions and 5213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
python-packages/contract_wrappers/test/test_exchange_wrapper.py
View File

@@ -5,7 +5,7 @@ import random
import pytest
from eth_utils import remove_0x_prefix
from zero_ex.contract_addresses import network_to_addresses, NetworkId
from zero_ex.contract_addresses import chain_to_addresses, ChainId
from zero_ex.contract_wrappers import TxParams
from zero_ex.contract_wrappers.exchange import Exchange
from zero_ex.contract_wrappers.exchange.types import Order
@@ -22,7 +22,7 @@ def exchange_wrapper(ganache_provider):
"""Get an Exchange wrapper instance."""
return Exchange(
web3_or_provider=ganache_provider,
contract_address=network_to_addresses(NetworkId.GANACHE).exchange,
contract_address=chain_to_addresses(ChainId.GANACHE).exchange,
)
@@ -161,8 +161,8 @@ def test_two_instantiations_with_web3_objects(web3_instance):
again." Test that that bug isn't occurring.
"""
exchange = Exchange( # pylint: disable=unused-variable
web3_instance, network_to_addresses(NetworkId.GANACHE).exchange
web3_instance, chain_to_addresses(ChainId.GANACHE).exchange
)
exchange2 = Exchange( # pylint: disable=unused-variable
web3_instance, network_to_addresses(NetworkId.GANACHE).exchange
web3_instance, chain_to_addresses(ChainId.GANACHE).exchange
)