Remove domain from Order type

This commit is contained in:
fragosti
2019-09-25 17:15:16 -07:00
parent 23b724dde4
commit 9870f55d24
36 changed files with 184 additions and 217 deletions

View File

@@ -177,10 +177,8 @@ describe(ContractName.BalanceThresholdFilter, () => {
makerFee: Web3Wrapper.toBaseUnitAmount(new BigNumber(100), DECIMALS_DEFAULT),
takerFee: Web3Wrapper.toBaseUnitAmount(new BigNumber(150), DECIMALS_DEFAULT),
senderAddress: erc721BalanceThresholdFilterInstance.address,
domain: {
verifyingContract: exchangeInstance.address,
chainId,
},
exchangeAddress: exchangeInstance.address,
chainId,
};
// Create two order factories with valid makers (who meet the threshold balance), and
// one factory for an invalid address (that does not meet the threshold balance)

View File

@@ -163,10 +163,8 @@ describe(ContractName.DutchAuction, () => {
expirationTimeSeconds: auctionEndTimeSeconds,
makerFee: constants.ZERO_AMOUNT,
takerFee: constants.ZERO_AMOUNT,
domain: {
verifyingContract: exchangeInstance.address,
chainId,
},
exchangeAddress: exchangeInstance.address,
chainId,
};
// Default buy order is for the auction begin price
const buyerDefaultOrderParams = {

View File

@@ -166,11 +166,6 @@ describe('OrderMatcher', () => {
constants.AWAIT_TRANSACTION_MINED_MS,
);
const domain = {
verifyingContract: exchange.address,
chainId,
};
// Create default order parameters
const defaultOrderParamsLeft = {
...constants.STATIC_ORDER_PARAMS,
@@ -180,7 +175,8 @@ describe('OrderMatcher', () => {
feeRecipientAddress: feeRecipientAddressLeft,
makerFee: constants.ZERO_AMOUNT,
takerFee: constants.ZERO_AMOUNT,
domain,
exchangeAddress: exchange.address,
chainId,
};
const defaultOrderParamsRight = {
...constants.STATIC_ORDER_PARAMS,
@@ -190,7 +186,8 @@ describe('OrderMatcher', () => {
feeRecipientAddress: feeRecipientAddressRight,
makerFee: constants.ZERO_AMOUNT,
takerFee: constants.ZERO_AMOUNT,
domain,
exchangeAddress: exchange.address,
chainId,
};
const privateKeyLeft = constants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(makerAddressLeft)];
orderFactoryLeft = new OrderFactory(privateKeyLeft, defaultOrderParamsLeft);