From 04eab19f15396c9d37981eb7e8db5f9461bcf15e Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Mon, 23 Sep 2019 17:56:42 -0700 Subject: [PATCH] Fix lingering cases of verifyingContractAddress --- .../asset-swapper/test/exchange_swap_quote_consumer_test.ts | 2 +- .../connect/test/fixtures/standard_relayer_api/orderbook.ts | 4 ++-- packages/connect/test/fixtures/standard_relayer_api/orders.ts | 2 +- packages/contract-wrappers/test/coordinator_wrapper_test.ts | 2 +- packages/orderbook/test/utils.ts | 2 +- packages/testnet-faucets/src/ts/handler.ts | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/asset-swapper/test/exchange_swap_quote_consumer_test.ts b/packages/asset-swapper/test/exchange_swap_quote_consumer_test.ts index 2190adfbaa..38ddb229e7 100644 --- a/packages/asset-swapper/test/exchange_swap_quote_consumer_test.ts +++ b/packages/asset-swapper/test/exchange_swap_quote_consumer_test.ts @@ -83,7 +83,7 @@ describe('ExchangeSwapQuoteConsumer', () => { makerFeeAssetData: assetDataUtils.encodeERC20AssetData(contractAddresses.zrxToken), takerFeeAssetData: assetDataUtils.encodeERC20AssetData(contractAddresses.zrxToken), domain: { - verifyingContractAddress: contractAddresses.exchange, + verifyingContract: contractAddresses.exchange, chainId: networkId, }, }; diff --git a/packages/connect/test/fixtures/standard_relayer_api/orderbook.ts b/packages/connect/test/fixtures/standard_relayer_api/orderbook.ts index 2df8bb558e..4881bb6532 100644 --- a/packages/connect/test/fixtures/standard_relayer_api/orderbook.ts +++ b/packages/connect/test/fixtures/standard_relayer_api/orderbook.ts @@ -27,7 +27,7 @@ export const orderbookResponse: OrderbookResponse = { signature: '0x012761a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33', domain: { chainId: 1, - verifyingContractAddress: '0x12459c951127e0c374ff9105dda097662a027093', + verifyingContract: '0x12459c951127e0c374ff9105dda097662a027093', }, }, metaData: {}, @@ -58,7 +58,7 @@ export const orderbookResponse: OrderbookResponse = { signature: '0x013842a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b3518891', domain: { chainId: 1, - verifyingContractAddress: '0x12459c951127e0c374ff9105dda097662a027093', + verifyingContract: '0x12459c951127e0c374ff9105dda097662a027093', }, }, metaData: {}, diff --git a/packages/connect/test/fixtures/standard_relayer_api/orders.ts b/packages/connect/test/fixtures/standard_relayer_api/orders.ts index 05b78ceae4..5605266649 100644 --- a/packages/connect/test/fixtures/standard_relayer_api/orders.ts +++ b/packages/connect/test/fixtures/standard_relayer_api/orders.ts @@ -26,7 +26,7 @@ export const ordersResponse: OrdersResponse = { signature: '0x012761a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33', domain: { chainId: 1, - verifyingContractAddress: '0x12459c951127e0c374ff9105dda097662a027093', + verifyingContract: '0x12459c951127e0c374ff9105dda097662a027093', }, }, metaData: {}, diff --git a/packages/contract-wrappers/test/coordinator_wrapper_test.ts b/packages/contract-wrappers/test/coordinator_wrapper_test.ts index df5401b4d1..4acdfc7a15 100644 --- a/packages/contract-wrappers/test/coordinator_wrapper_test.ts +++ b/packages/contract-wrappers/test/coordinator_wrapper_test.ts @@ -102,7 +102,7 @@ describe.skip('CoordinatorWrapper', () => { takerFeeAssetData: feeAssetData, senderAddress: contractAddresses.coordinator, domain: { - verifyingContractAddress: exchangeContractAddress, + verifyingContract: exchangeContractAddress, chainId, }, }; diff --git a/packages/orderbook/test/utils.ts b/packages/orderbook/test/utils.ts index 542897c9e5..eb2d4743ae 100644 --- a/packages/orderbook/test/utils.ts +++ b/packages/orderbook/test/utils.ts @@ -12,7 +12,7 @@ export const createOrder = (makerAssetData: string, takerAssetData: string): API takerFeeAssetData: takerAssetData, domain: { chainId: 0, - verifyingContractAddress: '0x00', + verifyingContract: '0x00', }, senderAddress: '0x00', makerAssetAmount: new BigNumber(1), diff --git a/packages/testnet-faucets/src/ts/handler.ts b/packages/testnet-faucets/src/ts/handler.ts index 44ec2ef7bc..76b5644c8f 100644 --- a/packages/testnet-faucets/src/ts/handler.ts +++ b/packages/testnet-faucets/src/ts/handler.ts @@ -183,7 +183,7 @@ export class Handler { .div(1000) .integerValue(BigNumber.ROUND_FLOOR), domain: { - verifyingContractAddress: networkConfig.contractWrappers.exchange.address, + verifyingContract: networkConfig.contractWrappers.exchange.address, chainId: networkConfig.networkId, }, };