aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-12-21 02:53:50 +0800
committerGreg Hysen <greg.hysen@gmail.com>2019-01-08 07:50:48 +0800
commit89fcbec43b04a49c45786067f61c539128e1c507 (patch)
treeb96b3a90629fe6d3cbf3f8714bc99b168c0b8dfd
parentc850046ea0b302f61a5fd24f77bab19784a2adc0 (diff)
downloaddexon-sol-tools-89fcbec43b04a49c45786067f61c539128e1c507.tar
dexon-sol-tools-89fcbec43b04a49c45786067f61c539128e1c507.tar.gz
dexon-sol-tools-89fcbec43b04a49c45786067f61c539128e1c507.tar.bz2
dexon-sol-tools-89fcbec43b04a49c45786067f61c539128e1c507.tar.lz
dexon-sol-tools-89fcbec43b04a49c45786067f61c539128e1c507.tar.xz
dexon-sol-tools-89fcbec43b04a49c45786067f61c539128e1c507.tar.zst
dexon-sol-tools-89fcbec43b04a49c45786067f61c539128e1c507.zip
changed name for confusion
-rw-r--r--contracts/extensions/test/extensions/dutch_auction.ts13
1 files changed, 6 insertions, 7 deletions
diff --git a/contracts/extensions/test/extensions/dutch_auction.ts b/contracts/extensions/test/extensions/dutch_auction.ts
index 7a1a546e7..5e1534594 100644
--- a/contracts/extensions/test/extensions/dutch_auction.ts
+++ b/contracts/extensions/test/extensions/dutch_auction.ts
@@ -68,9 +68,8 @@ describe(ContractName.DutchAuction, () => {
let erc721MakerAssetIds: BigNumber[];
const tenMinutesInSeconds = 10 * 60;
- let dutchAuctionInstance: DutchAuctionContract;
let dutchAuctionWrapper: DutchAuctionWrapper;
- let defaultMakerAssetData: string;
+ let defaultERC20MakerAssetData: string;
before(async () => {
await blockchainLifecycle.startAsync();
@@ -190,7 +189,7 @@ describe(ContractName.DutchAuction, () => {
const takerPrivateKey = constants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(takerAddress)];
sellerOrderFactory = new OrderFactory(makerPrivateKey, sellerDefaultOrderParams);
buyerOrderFactory = new OrderFactory(takerPrivateKey, buyerDefaultOrderParams);
- defaultMakerAssetData = assetDataUtils.encodeERC20AssetData(defaultMakerAssetAddress);
+ defaultERC20MakerAssetData = assetDataUtils.encodeERC20AssetData(defaultMakerAssetAddress);
});
after(async () => {
await blockchainLifecycle.revertAsync();
@@ -208,7 +207,7 @@ describe(ContractName.DutchAuction, () => {
it('should be worth the begin price at the begining of the auction', async () => {
auctionBeginTimeSeconds = new BigNumber(currentBlockTimestamp + 2);
const makerAssetData = assetDataUtils.encodeDutchAuctionAssetData(
- defaultMakerAssetData,
+ defaultERC20MakerAssetData,
auctionBeginTimeSeconds,
auctionBeginAmount,
);
@@ -222,7 +221,7 @@ describe(ContractName.DutchAuction, () => {
auctionBeginTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds * 2);
auctionEndTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds);
const makerAssetData = assetDataUtils.encodeDutchAuctionAssetData(
- defaultMakerAssetData,
+ defaultERC20MakerAssetData,
auctionBeginTimeSeconds,
auctionBeginAmount,
);
@@ -288,7 +287,7 @@ describe(ContractName.DutchAuction, () => {
auctionBeginTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds * 2);
auctionEndTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds);
const makerAssetData = assetDataUtils.encodeDutchAuctionAssetData(
- defaultMakerAssetData,
+ defaultERC20MakerAssetData,
auctionBeginTimeSeconds,
auctionBeginAmount,
);
@@ -322,7 +321,7 @@ describe(ContractName.DutchAuction, () => {
it('begin time is less than end time', async () => {
auctionBeginTimeSeconds = new BigNumber(auctionEndTimeSeconds).plus(tenMinutesInSeconds);
const makerAssetData = assetDataUtils.encodeDutchAuctionAssetData(
- defaultMakerAssetData,
+ defaultERC20MakerAssetData,
auctionBeginTimeSeconds,
auctionBeginAmount,
);