CI/test-python: give launch-kit-backend CHAIN_ID, not NETWORK_ID (#2327)

* CI/test-python: give LK ID of chain, not network

For CircleCI job test-python, change docker config for
launch-kit-backend to set an environment variable for the chain ID,
not for the network ID.  This was failing on all branches after a recent
update to the `0xorg/launch-kit-backend:v3` tag.

* Update docker config used for local testing

* Update documentation of test environment
This commit is contained in:
F. Eugene Aumson
2019-11-09 20:25:14 -05:00
committed by GitHub
parent 3b9d84fa58
commit 869d2c02fa
3 changed files with 22 additions and 7 deletions

View File

@@ -219,7 +219,7 @@ jobs:
- image: 0xorg/launch-kit-backend:v3 - image: 0xorg/launch-kit-backend:v3
environment: environment:
RPC_URL: 'http://localhost:8545' RPC_URL: 'http://localhost:8545'
NETWORK_ID: 50 CHAIN_ID: 1337
WHITELIST_ALL_TOKENS: True WHITELIST_ALL_TOKENS: True
FEE_RECIPIENT: '0x0000000000000000000000000000000000000001' FEE_RECIPIENT: '0x0000000000000000000000000000000000000001'
MAKER_FEE_UNIT_AMOUNT: 0 MAKER_FEE_UNIT_AMOUNT: 0

View File

@@ -38,9 +38,24 @@ To replicate this setup, one could run the following commands:
docker run -d -p 8545:8545 0xorg/ganache-cli docker run -d -p 8545:8545 0xorg/ganache-cli
docker run -d -p 60557:60557 --network host \
-e ETHEREUM_RPC_URL=http://localhost:8545 \
-e ETHEREUM_NETWORK_ID=50 \
-e ETHEREUM_CHAIN_ID=1337 \
-e USE_BOOTSTRAP_LIST=false \
-e VERBOSITY=3 \
-e PRIVATE_KEY_PATH= \
-e BLOCK_POLLING_INTERVAL=5s \
-e P2P_LISTEN_PORT=60557
0xorg/mesh:6.0.0-beta-0xv3
docker run -d --network host \ docker run -d --network host \
-e RPC_URL=http://localhost:8545 \ -e RPC_URL=http://localhost:8545 \
-e NETWORK_ID=50 \ -e CHAIN_ID=1337 \
-e FEE_RECIPIENT=0x0000000000000000000000000000000000000001 \
-e MAKER_FEE_UNIT_AMOUNT=0 \
-e TAKER_FEE_UNIT_AMOUNT=0
-e MESH_ENDPOINT=ws://localhost:60557
-e WHITELIST_ALL_TOKENS=True \ -e WHITELIST_ALL_TOKENS=True \
0xorg/launch-kit-ci 0xorg/launch-kit-ci
@@ -168,7 +183,7 @@ Retrieve the order we just posted:
>>> relayer.get_order("0x" + order_hash_hex) >>> relayer.get_order("0x" + order_hash_hex)
{'meta_data': {'orderHash': '0x...', {'meta_data': {'orderHash': '0x...',
'remainingFillableTakerAssetAmount': '2'}, 'remainingFillableTakerAssetAmount': '2'},
'order': {'chainId': 50, 'order': {'chainId': 1337,
'exchangeAddress': '0x...', 'exchangeAddress': '0x...',
'expirationTimeSeconds': '...', 'expirationTimeSeconds': '...',
'feeRecipientAddress': '0x0000000000000000000000000000000000000000', 'feeRecipientAddress': '0x0000000000000000000000000000000000000000',
@@ -195,7 +210,7 @@ of the one we just posted:
>>> relayer.get_orders() >>> relayer.get_orders()
{'records': [{'meta_data': {'orderHash': '0x...', {'records': [{'meta_data': {'orderHash': '0x...',
'remainingFillableTakerAssetAmount': '2'}, 'remainingFillableTakerAssetAmount': '2'},
'order': {'chainId': 50, 'order': {'chainId': 1337,
'exchangeAddress': '0x...', 'exchangeAddress': '0x...',
'expirationTimeSeconds': '...', 'expirationTimeSeconds': '...',
'feeRecipientAddress': '0x0000000000000000000000000000000000000000', 'feeRecipientAddress': '0x0000000000000000000000000000000000000000',
@@ -255,7 +270,7 @@ consists just of our order):
{'asks': {'records': [...]}, {'asks': {'records': [...]},
'bids': {'records': [{'meta_data': {'orderHash': '0x...', 'bids': {'records': [{'meta_data': {'orderHash': '0x...',
'remainingFillableTakerAssetAmount': '2'}, 'remainingFillableTakerAssetAmount': '2'},
'order': {'chainId': 50, 'order': {'chainId': 1337,
'exchangeAddress': '0x...', 'exchangeAddress': '0x...',
'expirationTimeSeconds': '...', 'expirationTimeSeconds': '...',
'feeRecipientAddress': '0x0000000000000000000000000000000000000000', 'feeRecipientAddress': '0x0000000000000000000000000000000000000000',
@@ -280,7 +295,7 @@ Select an order from the orderbook
>>> order = jsdict_to_order(orderbook.bids.records[0].order) >>> order = jsdict_to_order(orderbook.bids.records[0].order)
>>> from pprint import pprint >>> from pprint import pprint
>>> pprint(order) >>> pprint(order)
{'chainId': 50, {'chainId': 1337,
'expirationTimeSeconds': ..., 'expirationTimeSeconds': ...,
'feeRecipientAddress': '0x0000000000000000000000000000000000000000', 'feeRecipientAddress': '0x0000000000000000000000000000000000000000',
'makerAddress': '0x...', 'makerAddress': '0x...',

View File

@@ -35,7 +35,7 @@ services:
- "3000:3000" - "3000:3000"
network_mode: "host" # to connect to ganache network_mode: "host" # to connect to ganache
environment: environment:
- NETWORK_ID=50 - CHAIN_ID=1337
- RPC_URL=http://localhost:8545 - RPC_URL=http://localhost:8545
- WHITELIST_ALL_TOKENS=True - WHITELIST_ALL_TOKENS=True
- FEE_RECIPIENT=0x0000000000000000000000000000000000000001 - FEE_RECIPIENT=0x0000000000000000000000000000000000000001