Skip to content
This repository was archived by the owner on Jan 18, 2023. It is now read-only.
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 32 additions & 25 deletions test/core/extensions/coreIssuanceOrder.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -328,43 +328,47 @@ contract("CoreIssuanceOrder", (accounts) => {
});
});

describe("#cancelOrder", async () => {
describe.only("#cancelOrder", async () => {
let subjectCaller: Address;
let subjectQuantityToCancel: BigNumber;
let subjectExchangeOrdersData: Bytes32;

const naturalUnit: BigNumber = ether(2);
let components: StandardTokenMockContract[] = [];
let componentUnits: BigNumber[];
let setToken: SetTokenContract;
let signerAddress: Address;
let relayerAddress: Address;
let componentAddresses: Address[];

let quantity: BigNumber;
let makerTokenAmount: BigNumber;
let expirationTime: number;
let issuanceOrderParams: any;

beforeEach(async () => {
signerAddress = signerAccount;
relayerAddress = relayerAccount;
const signerAddress = signerAccount;
const relayerAddress = relayerAccount;

components = await erc20Wrapper.deployTokensAsync(2, signerAddress); //For current purposes issue to maker/signer
const components = await erc20Wrapper.deployTokensAsync(2, signerAddress); //For current purposes issue to maker/signer
await erc20Wrapper.approveTransfersAsync(components, transferProxy.address, signerAddress);

componentAddresses = _.map(components, (token) => token.address);
componentUnits = _.map(components, () => ether(4)); // Multiple of naturalUnit
setToken = await coreWrapper.createSetTokenAsync(
const componentAddresses = _.map(components, (token) => token.address);
const componentUnits = _.map(components, () => ether(4)); // Multiple of naturalUnit
const setToken = await coreWrapper.createSetTokenAsync(
core,
setTokenFactory.address,
componentAddresses,
componentUnits,
naturalUnit,
ether(2),
);

await coreWrapper.registerDefaultExchanges(core);

subjectCaller = signerAccount;
subjectQuantityToCancel = ether(2);
issuanceOrderParams = await generateFillOrderParameters(setToken.address, signerAddress, signerAddress, componentAddresses[0], relayerAddress);
issuanceOrderParams = await generateFillOrderParameters(
setToken.address,
signerAddress,
signerAddress,
componentAddresses[0],
relayerAddress,
quantity || ether(4),
makerTokenAmount || ether(10),
expirationTime || 10,
);
});

async function subject(): Promise<string> {
Expand Down Expand Up @@ -424,8 +428,10 @@ contract("CoreIssuanceOrder", (accounts) => {
});

describe("when the order has expired", async () => {
beforeEach(async () => {
issuanceOrderParams = await generateFillOrderParameters(setToken.address, signerAddress, signerAddress, componentAddresses[0], relayerAddress, undefined, undefined, -1)
before(async () => {
quantity = undefined;
makerTokenAmount = undefined;
expirationTime = -1;
});

it("should revert", async () => {
Expand All @@ -444,8 +450,8 @@ contract("CoreIssuanceOrder", (accounts) => {
});

describe("when the Set Token quantity in Issuance Order is not a multiple of the natural unit of the set", async () => {
beforeEach(async () => {
issuanceOrderParams = await generateFillOrderParameters(setToken.address, signerAddress, signerAddress, componentAddresses[0], relayerAddress, ether(5));
before(async () => {
quantity = ether(5);
});

it("should revert", async () => {
Expand All @@ -454,8 +460,8 @@ contract("CoreIssuanceOrder", (accounts) => {
});

describe("when Set Token quantity in Issuance Order equals 0", async () => {
beforeEach(async () => {
issuanceOrderParams = await generateFillOrderParameters(setToken.address, signerAddress, signerAddress, componentAddresses[0], relayerAddress, ZERO);
before(async () => {
quantity = ZERO;
});

it("should revert", async () => {
Expand All @@ -464,8 +470,9 @@ contract("CoreIssuanceOrder", (accounts) => {
});

describe("when makerTokenAmount in Issuance Order equals 0", async () => {
beforeEach(async () => {
issuanceOrderParams = await generateFillOrderParameters(setToken.address, signerAddress, signerAddress, componentAddresses[0], relayerAddress, undefined, ZERO);
before(async () => {
quantity = undefined;
makerTokenAmount = ZERO;
});

it("should revert", async () => {
Expand Down