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

changed name for confusion

Browse Source
This commit is contained in:
Greg Hysen 2018-12-20 10:53:50 -08:00
parent c850046ea0
commit 89fcbec43b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contracts/extensions/test/extensions/dutch_auction.ts
View File

@ -68,9 +68,8 @@ describe(ContractName.DutchAuction, () => {
let erc721MakerAssetIds: BigNumber[]; let erc721MakerAssetIds: BigNumber[];
const tenMinutesInSeconds = 10 * 60; const tenMinutesInSeconds = 10 * 60;
let dutchAuctionInstance: DutchAuctionContract;
let dutchAuctionWrapper: DutchAuctionWrapper; let dutchAuctionWrapper: DutchAuctionWrapper;
let defaultMakerAssetData: string; let defaultERC20MakerAssetData: string;
before(async () => { before(async () => {
await blockchainLifecycle.startAsync(); await blockchainLifecycle.startAsync();
@ -190,7 +189,7 @@ describe(ContractName.DutchAuction, () => {
const takerPrivateKey = constants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(takerAddress)]; const takerPrivateKey = constants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(takerAddress)];
sellerOrderFactory = new OrderFactory(makerPrivateKey, sellerDefaultOrderParams); sellerOrderFactory = new OrderFactory(makerPrivateKey, sellerDefaultOrderParams);
buyerOrderFactory = new OrderFactory(takerPrivateKey, buyerDefaultOrderParams); buyerOrderFactory = new OrderFactory(takerPrivateKey, buyerDefaultOrderParams);
defaultMakerAssetData = assetDataUtils.encodeERC20AssetData(defaultMakerAssetAddress); defaultERC20MakerAssetData = assetDataUtils.encodeERC20AssetData(defaultMakerAssetAddress);
}); });
after(async () => { after(async () => {
await blockchainLifecycle.revertAsync(); await blockchainLifecycle.revertAsync();
@ -208,7 +207,7 @@ describe(ContractName.DutchAuction, () => {
it('should be worth the begin price at the begining of the auction', async () => { it('should be worth the begin price at the begining of the auction', async () => {
auctionBeginTimeSeconds = new BigNumber(currentBlockTimestamp + 2); auctionBeginTimeSeconds = new BigNumber(currentBlockTimestamp + 2);
const makerAssetData = assetDataUtils.encodeDutchAuctionAssetData( const makerAssetData = assetDataUtils.encodeDutchAuctionAssetData(
defaultMakerAssetData, defaultERC20MakerAssetData,
auctionBeginTimeSeconds, auctionBeginTimeSeconds,
auctionBeginAmount, auctionBeginAmount,
); );
@ -222,7 +221,7 @@ describe(ContractName.DutchAuction, () => {
auctionBeginTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds * 2); auctionBeginTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds * 2);
auctionEndTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds); auctionEndTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds);
const makerAssetData = assetDataUtils.encodeDutchAuctionAssetData( const makerAssetData = assetDataUtils.encodeDutchAuctionAssetData(
defaultMakerAssetData, defaultERC20MakerAssetData,
auctionBeginTimeSeconds, auctionBeginTimeSeconds,
auctionBeginAmount, auctionBeginAmount,
); );
@ -288,7 +287,7 @@ describe(ContractName.DutchAuction, () => {
auctionBeginTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds * 2); auctionBeginTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds * 2);
auctionEndTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds); auctionEndTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds);
const makerAssetData = assetDataUtils.encodeDutchAuctionAssetData( const makerAssetData = assetDataUtils.encodeDutchAuctionAssetData(
defaultMakerAssetData, defaultERC20MakerAssetData,
auctionBeginTimeSeconds, auctionBeginTimeSeconds,
auctionBeginAmount, auctionBeginAmount,
); );
@ -322,7 +321,7 @@ describe(ContractName.DutchAuction, () => {
it('begin time is less than end time', async () => { it('begin time is less than end time', async () => {
auctionBeginTimeSeconds = new BigNumber(auctionEndTimeSeconds).plus(tenMinutesInSeconds); auctionBeginTimeSeconds = new BigNumber(auctionEndTimeSeconds).plus(tenMinutesInSeconds);
const makerAssetData = assetDataUtils.encodeDutchAuctionAssetData( const makerAssetData = assetDataUtils.encodeDutchAuctionAssetData(
defaultMakerAssetData, defaultERC20MakerAssetData,
auctionBeginTimeSeconds, auctionBeginTimeSeconds,
auctionBeginAmount, auctionBeginAmount,
); );