* Rename existing wrapper, to match contract name * base contract: make member var public * json_schemas.py: stop storing copies of schemas! * .gitignore generated erc20_token.py wrapper * json schemas: allow uppercase digits in address * existing exchange wrapper: re-order methods to match method order in Solidity contract, to reduce noise in upcoming diffs of newly generated code vs. old manually-written code. * existing exchange wrapper: rename method params To match contract method param names * existing exchange wrapper: remove redundant member * existing exchange wrapper: make signatures bytes Not strings. * abi-gen/test-cli: show context on diff failure * abi-gen-templates/Py: fix broken event interface Previous changes had removed the `token_address` parameter from all generated methods, but this instance was missed because there weren't tests/examples using events for the first contract for which wrappers were generated (ERC20Token). * abi-gen: remove unused method parameters * abi-gen: convert Py method params to snake case * abi-gen: rewrite Python tuple handling * python-generated-wrappers: include Exchange * abi-gen-templates/Py: easy linter fixes * abi-gen-templates/Py: satisfy docstring linters * abi-gen-templates/Py: normalize bytes before use * contract_wrappers.py: replace Exchange w/generated * contract_wrappers.py: rm manually written Exchange * contract_wrappers.py/doctest: rename variables * abi-gen: fix misspelling in docstring Co-Authored-By: Fabio B <me@fabioberger.com> * Py docs: error on warning, and test build in CI * abi-gen: doc Py bytes params as requiring UTF-8 * abi-gen: git mv diff.sh test-cli/ * abi-gen: put Py wrapper in module folder, not file This leaves space for user-defined additions to the same module, such as for custom types, as shown herein. * abi-gen: customizable param validation for Python * contract_wrappers.py: JSON schema Order validation * CircleCI Build Artifacts For abi-gen command-line test output, for generated Python contract wrappers as output by abi-gen, for generated Python contract wrappers as reformatted and included in the Python package area, and for the "build" output folder in each Python package, which includes the generated documentation. * CHANGELOG updates for all components * abi-gen: grammar in comments Co-Authored-By: Fabio B <me@fabioberger.com> * abi-gen: CHANGELOG spelling correction Co-Authored-By: Fabio B <me@fabioberger.com> * order_utils.py: reverse (chronological) CHANGELOG * abi-gen-templates: reset CHANGELOG patch version * CHANGELOGs: use multiple entries where appropriate * abi-gen: enable devdoc solc output in test-cli * abi-gen-templates/Py: consolidate return type * abi-gen/test-cli: non-pure fixture contract method Added a method to the "dummy" test fixture contract that isn't pure. All of the other prior method cases were pure. * abi-gen/Py: fix const methods missing return type * abi-gen/Py: fix wrong return types on some methods Specifically, wrapper methods wrapping contract methods that modify contract state and return no return value. There was no test case for this. Now there is. * contract_wrappers.py: rm generated code in `clean` * Parallelize Py monorepo scripts (test, lint, etc)
130 lines
4.4 KiB
Python
130 lines
4.4 KiB
Python
"""Test 0x Exchnage wrapper."""
|
|
|
|
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_wrappers import Exchange, TxParams
|
|
from zero_ex.contract_wrappers.exchange.types import Order
|
|
from zero_ex.json_schemas import assert_valid
|
|
from zero_ex.order_utils import generate_order_hash_hex, sign_hash_to_bytes
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def exchange_wrapper(ganache_provider):
|
|
"""Get an Exchange wrapper instance."""
|
|
return Exchange(
|
|
provider=ganache_provider,
|
|
contract_address=NETWORK_TO_ADDRESSES[NetworkId.GANACHE].exchange,
|
|
)
|
|
|
|
|
|
def create_test_order(
|
|
maker_address,
|
|
maker_asset_amount,
|
|
maker_asset_data,
|
|
taker_asset_amount,
|
|
taker_asset_data,
|
|
):
|
|
"""Create a test order."""
|
|
order = Order(
|
|
makerAddress=maker_address.lower(),
|
|
takerAddress="0x0000000000000000000000000000000000000000",
|
|
feeRecipientAddress="0x0000000000000000000000000000000000000000",
|
|
senderAddress="0x0000000000000000000000000000000000000000",
|
|
makerAssetAmount=maker_asset_amount,
|
|
takerAssetAmount=taker_asset_amount,
|
|
makerFee=0,
|
|
takerFee=0,
|
|
expirationTimeSeconds=100000000000000,
|
|
salt=random.randint(1, 1000000000),
|
|
makerAssetData=maker_asset_data,
|
|
takerAssetData=taker_asset_data,
|
|
)
|
|
return order
|
|
|
|
|
|
def assert_fill_log(fill_log, maker, taker, order, order_hash):
|
|
"""assert that the fill log matches the order details"""
|
|
assert fill_log.makerAddress == maker
|
|
assert fill_log.takerAddress == taker
|
|
assert fill_log.feeRecipientAddress == order["feeRecipientAddress"]
|
|
assert fill_log.senderAddress == taker
|
|
assert fill_log.orderHash == bytes.fromhex(remove_0x_prefix(order_hash))
|
|
assert fill_log.makerAssetFilledAmount == order["makerAssetAmount"]
|
|
assert fill_log.takerAssetFilledAmount == order["takerAssetAmount"]
|
|
assert fill_log.makerFeePaid == order["makerFee"]
|
|
assert fill_log.takerFeePaid == order["takerFee"]
|
|
assert fill_log.makerAssetData == order["makerAssetData"]
|
|
assert fill_log.takerAssetData == order["takerAssetData"]
|
|
|
|
|
|
def test_exchange_wrapper__fill_order(
|
|
accounts,
|
|
exchange_wrapper, # pylint: disable=redefined-outer-name
|
|
ganache_provider,
|
|
weth_asset_data,
|
|
):
|
|
"""Test filling an order."""
|
|
taker = accounts[0]
|
|
maker = accounts[1]
|
|
exchange_address = exchange_wrapper.contract_address
|
|
order = create_test_order(maker, 1, weth_asset_data, 1, weth_asset_data)
|
|
order_hash = generate_order_hash_hex(
|
|
order=order, exchange_address=exchange_address
|
|
)
|
|
order_signature = sign_hash_to_bytes(ganache_provider, maker, order_hash)
|
|
|
|
tx_hash = exchange_wrapper.fill_order(
|
|
order=order,
|
|
taker_asset_fill_amount=order["takerAssetAmount"],
|
|
signature=order_signature,
|
|
tx_params=TxParams(from_=taker),
|
|
)
|
|
assert_valid(tx_hash.hex(), "/hexSchema")
|
|
|
|
fill_event = exchange_wrapper.get_fill_event(tx_hash)
|
|
assert_fill_log(fill_event[0].args, maker, taker, order, order_hash)
|
|
|
|
|
|
# pylint: disable=too-many-locals
|
|
def test_exchange_wrapper__batch_fill_orders(
|
|
accounts,
|
|
exchange_wrapper, # pylint: disable=redefined-outer-name
|
|
ganache_provider,
|
|
weth_asset_data,
|
|
):
|
|
"""Test filling a batch of orders."""
|
|
taker = accounts[0]
|
|
maker = accounts[1]
|
|
exchange_address = exchange_wrapper.contract_address
|
|
orders = []
|
|
order_1 = create_test_order(maker, 1, weth_asset_data, 1, weth_asset_data)
|
|
order_2 = create_test_order(maker, 1, weth_asset_data, 1, weth_asset_data)
|
|
orders.append(order_1)
|
|
orders.append(order_2)
|
|
order_hashes = [
|
|
generate_order_hash_hex(order=order, exchange_address=exchange_address)
|
|
for order in orders
|
|
]
|
|
order_signatures = [
|
|
sign_hash_to_bytes(ganache_provider, maker, order_hash)
|
|
for order_hash in order_hashes
|
|
]
|
|
taker_amounts = [order["takerAssetAmount"] for order in orders]
|
|
tx_hash = exchange_wrapper.batch_fill_orders(
|
|
orders=orders,
|
|
taker_asset_fill_amounts=taker_amounts,
|
|
signatures=order_signatures,
|
|
tx_params=TxParams(from_=taker),
|
|
)
|
|
assert_valid(tx_hash.hex(), "/hexSchema")
|
|
|
|
fill_events = exchange_wrapper.get_fill_event(tx_hash)
|
|
for index, order in enumerate(orders):
|
|
assert_fill_log(
|
|
fill_events[index].args, maker, taker, order, order_hashes[index]
|
|
)
|