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

Rename orderWithoutExchangeAddress -> orderWithoutDomain in contracts/exchange tests.

Browse Source
This commit is contained in:
Lawrence Forman 2019-04-01 13:54:56 -04:00 committed by Amir Bandeali
parent 5a6cf2b690
commit 041bf9b54e
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
contracts/exchange/test/transactions.ts
View File

@ -49,7 +49,7 @@ describe('Exchange transactions', () => {
let domain: EIP712DomainWithDefaultSchema; let domain: EIP712DomainWithDefaultSchema;
let signedOrder: SignedOrder; let signedOrder: SignedOrder;
let signedTx: SignedZeroExTransaction; let signedTx: SignedZeroExTransaction;
let orderWithoutExchangeAddress: OrderWithoutDomain; let orderWithoutDomain: OrderWithoutDomain;
let orderFactory: OrderFactory; let orderFactory: OrderFactory;
let makerTransactionFactory: TransactionFactory; let makerTransactionFactory: TransactionFactory;
let takerTransactionFactory: TransactionFactory; let takerTransactionFactory: TransactionFactory;
@ -136,11 +136,11 @@ describe('Exchange transactions', () => {
beforeEach(async () => { beforeEach(async () => {
erc20Balances = await erc20Wrapper.getBalancesAsync(); erc20Balances = await erc20Wrapper.getBalancesAsync();
signedOrder = await orderFactory.newSignedOrderAsync(); signedOrder = await orderFactory.newSignedOrderAsync();
orderWithoutExchangeAddress = orderUtils.getOrderWithoutDomain(signedOrder); orderWithoutDomain = orderUtils.getOrderWithoutDomain(signedOrder);
takerAssetFillAmount = signedOrder.takerAssetAmount.div(2); takerAssetFillAmount = signedOrder.takerAssetAmount.div(2);
const data = exchange.fillOrder.getABIEncodedTransactionData( const data = exchange.fillOrder.getABIEncodedTransactionData(
orderWithoutExchangeAddress, orderWithoutDomain,
takerAssetFillAmount, takerAssetFillAmount,
signedOrder.signature, signedOrder.signature,
); );
@ -206,7 +206,7 @@ describe('Exchange transactions', () => {
describe('cancelOrder', () => { describe('cancelOrder', () => {
beforeEach(async () => { beforeEach(async () => {
const data = exchange.cancelOrder.getABIEncodedTransactionData(orderWithoutExchangeAddress); const data = exchange.cancelOrder.getABIEncodedTransactionData(orderWithoutDomain);
signedTx = makerTransactionFactory.newSignedTransaction(data); signedTx = makerTransactionFactory.newSignedTransaction(data);
}); });
@ -257,16 +257,16 @@ describe('Exchange transactions', () => {
); );
const takerAssetFillAmount = signedOrder.takerAssetAmount; const takerAssetFillAmount = signedOrder.takerAssetAmount;
orderWithoutExchangeAddress = orderUtils.getOrderWithoutDomain(signedOrder); orderWithoutDomain = orderUtils.getOrderWithoutDomain(signedOrder);
const fillData = exchange.fillOrder.getABIEncodedTransactionData( const fillData = exchange.fillOrder.getABIEncodedTransactionData(
orderWithoutExchangeAddress, orderWithoutDomain,
takerAssetFillAmount, takerAssetFillAmount,
signedOrder.signature, signedOrder.signature,
); );
const signedFillTx = takerTransactionFactory.newSignedTransaction(fillData); const signedFillTx = takerTransactionFactory.newSignedTransaction(fillData);
return expectTransactionFailedAsync( return expectTransactionFailedAsync(
exchangeWrapperContract.fillOrder.sendTransactionAsync( exchangeWrapperContract.fillOrder.sendTransactionAsync(
orderWithoutExchangeAddress, orderWithoutDomain,
takerAssetFillAmount, takerAssetFillAmount,
signedFillTx.salt, signedFillTx.salt,
signedOrder.signature, signedOrder.signature,
@ -288,15 +288,15 @@ describe('Exchange transactions', () => {
erc20Balances = await erc20Wrapper.getBalancesAsync(); erc20Balances = await erc20Wrapper.getBalancesAsync();
const takerAssetFillAmount = signedOrder.takerAssetAmount; const takerAssetFillAmount = signedOrder.takerAssetAmount;
orderWithoutExchangeAddress = orderUtils.getOrderWithoutDomain(signedOrder); orderWithoutDomain = orderUtils.getOrderWithoutDomain(signedOrder);
const data = exchange.fillOrder.getABIEncodedTransactionData( const data = exchange.fillOrder.getABIEncodedTransactionData(
orderWithoutExchangeAddress, orderWithoutDomain,
takerAssetFillAmount, takerAssetFillAmount,
signedOrder.signature, signedOrder.signature,
); );
signedTx = takerTransactionFactory.newSignedTransaction(data); signedTx = takerTransactionFactory.newSignedTransaction(data);
await exchangeWrapperContract.fillOrder.sendTransactionAsync( await exchangeWrapperContract.fillOrder.sendTransactionAsync(
orderWithoutExchangeAddress, orderWithoutDomain,
takerAssetFillAmount, takerAssetFillAmount,
signedTx.salt, signedTx.salt,
signedOrder.signature, signedOrder.signature,
@ -381,12 +381,12 @@ describe('Exchange transactions', () => {
constants.AWAIT_TRANSACTION_MINED_MS, constants.AWAIT_TRANSACTION_MINED_MS,
); );
orderWithoutExchangeAddress = orderUtils.getOrderWithoutDomain(signedOrder); orderWithoutDomain = orderUtils.getOrderWithoutDomain(signedOrder);
const takerAssetFillAmount = signedOrder.takerAssetAmount; const takerAssetFillAmount = signedOrder.takerAssetAmount;
const salt = generatePseudoRandomSalt(); const salt = generatePseudoRandomSalt();
return expectTransactionFailedAsync( return expectTransactionFailedAsync(
whitelist.fillOrderIfWhitelisted.sendTransactionAsync( whitelist.fillOrderIfWhitelisted.sendTransactionAsync(
orderWithoutExchangeAddress, orderWithoutDomain,
takerAssetFillAmount, takerAssetFillAmount,
salt, salt,
signedOrder.signature, signedOrder.signature,
@ -403,12 +403,12 @@ describe('Exchange transactions', () => {
constants.AWAIT_TRANSACTION_MINED_MS, constants.AWAIT_TRANSACTION_MINED_MS,
); );
orderWithoutExchangeAddress = orderUtils.getOrderWithoutDomain(signedOrder); orderWithoutDomain = orderUtils.getOrderWithoutDomain(signedOrder);
const takerAssetFillAmount = signedOrder.takerAssetAmount; const takerAssetFillAmount = signedOrder.takerAssetAmount;
const salt = generatePseudoRandomSalt(); const salt = generatePseudoRandomSalt();
return expectTransactionFailedAsync( return expectTransactionFailedAsync(
whitelist.fillOrderIfWhitelisted.sendTransactionAsync( whitelist.fillOrderIfWhitelisted.sendTransactionAsync(
orderWithoutExchangeAddress, orderWithoutDomain,
takerAssetFillAmount, takerAssetFillAmount,
salt, salt,
signedOrder.signature, signedOrder.signature,
@ -430,12 +430,12 @@ describe('Exchange transactions', () => {
constants.AWAIT_TRANSACTION_MINED_MS, constants.AWAIT_TRANSACTION_MINED_MS,
); );
orderWithoutExchangeAddress = orderUtils.getOrderWithoutDomain(signedOrder); orderWithoutDomain = orderUtils.getOrderWithoutDomain(signedOrder);
const takerAssetFillAmount = signedOrder.takerAssetAmount; const takerAssetFillAmount = signedOrder.takerAssetAmount;
const salt = generatePseudoRandomSalt(); const salt = generatePseudoRandomSalt();
await web3Wrapper.awaitTransactionSuccessAsync( await web3Wrapper.awaitTransactionSuccessAsync(
await whitelist.fillOrderIfWhitelisted.sendTransactionAsync( await whitelist.fillOrderIfWhitelisted.sendTransactionAsync(
orderWithoutExchangeAddress, orderWithoutDomain,
takerAssetFillAmount, takerAssetFillAmount,
salt, salt,
signedOrder.signature, signedOrder.signature,