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

Renamed all instances of timestamp to salt. Clarified test case wording.

Browse Source
This commit is contained in:
Greg Hysen
2018-03-19 10:56:21 -07:00
committed by Amir Bandeali
parent bf3c4f4743
commit 1efba5979f
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/contracts/src/utils/exchange_wrapper.ts
View File

@@ -168,11 +168,11 @@ export class ExchangeWrapper {
return tx;
}
public async cancelOrdersBeforeAsync(
timestamp: BigNumber,
salt: BigNumber,
from: string,
): Promise<TransactionReceiptWithDecodedLogs> {
const txHash = await this._exchange.cancelOrdersBefore.sendTransactionAsync(
timestamp,
salt,
{ from },
);
const tx = await this._getTxWithDecodedExchangeLogsAsync(txHash);

2
packages/contracts/src/utils/types.ts
View File

@@ -29,7 +29,7 @@ export interface BatchCancelOrders {
}
export interface CancelOrdersBefore {
timestamp: BigNumber;
salt: BigNumber;
}
export interface DefaultOrderParams {

30
packages/contracts/test/exchange/core.ts
View File

@@ -743,30 +743,30 @@ describe('Exchange', () => {
});
describe('cancelOrdersBefore', () => {
it('should fail to set timestamp less than existing CancelBefore timestamp', async () => {
const timestamp = new BigNumber(1);
await exWrapper.cancelOrdersBeforeAsync(timestamp, makerAddress);
const lesser_timestamp = new BigNumber(0);
it('should fail to set makerEpoch less than current makerEpoch', async () => {
const makerEpoch = new BigNumber(1);
await exWrapper.cancelOrdersBeforeAsync(makerEpoch, makerAddress);
const lesserMakerEpoch = new BigNumber(0);
return expect(
exWrapper.cancelOrdersBeforeAsync(lesser_timestamp, makerAddress),
exWrapper.cancelOrdersBeforeAsync(lesserMakerEpoch, makerAddress),
).to.be.rejectedWith(constants.REVERT);
});
it('should fail to set timestamp equal to existing CancelBefore timestamp', async () => {
const timestamp = new BigNumber(1);
await exWrapper.cancelOrdersBeforeAsync(timestamp, makerAddress);
it('should fail to set makerEpoch equal to existing makerEpoch', async () => {
const makerEpoch = new BigNumber(1);
await exWrapper.cancelOrdersBeforeAsync(makerEpoch, makerAddress);
return expect(
exWrapper.cancelOrdersBeforeAsync(timestamp, makerAddress),
exWrapper.cancelOrdersBeforeAsync(makerEpoch, makerAddress),
).to.be.rejectedWith(constants.REVERT);
});
it('should cancel only orders with a timestamp less than CancelBefore timestamp', async () => {
// Cancel all transactions with a timestamp less than 1
const timestamp = new BigNumber(1);
await exWrapper.cancelOrdersBeforeAsync(timestamp, makerAddress);
it('should cancel only orders with a makerEpoch less than existing makerEpoch', async () => {
// Cancel all transactions with a makerEpoch less than 1
const makerEpoch = new BigNumber(1);
await exWrapper.cancelOrdersBeforeAsync(makerEpoch, makerAddress);
// Create 3 orders with timestamps 0,1,2
// Since we cancelled with timestamp=1, orders with timestamp<1 will not be processed
// Create 3 orders with makerEpoch values: 0,1,2
// Since we cancelled with makerEpoch=1, orders with makerEpoch<1 will not be processed
balances = await dmyBalances.getAsync();
const signedOrders = await Promise.all([
orderFactory.newSignedOrder({