From a8d58aeac4aada4c52bed3b5268b8070764fea7e Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Wed, 27 Feb 2019 12:47:48 -0800 Subject: [PATCH] ran prettier --- contracts/erc1155/test/erc1155_token.ts | 211 ++++++------------ .../erc1155/test/utils/erc1155_wrapper.ts | 65 +++--- 2 files changed, 102 insertions(+), 174 deletions(-) diff --git a/contracts/erc1155/test/erc1155_token.ts b/contracts/erc1155/test/erc1155_token.ts index f65cd76538..67485f2a80 100644 --- a/contracts/erc1155/test/erc1155_token.ts +++ b/contracts/erc1155/test/erc1155_token.ts @@ -31,9 +31,9 @@ describe('ERC1155Token', () => { // constant values used in transfer tests const nftOwnerBalance = new BigNumber(1); const nftNotOwnerBalance = new BigNumber(0); - const spenderInitialBalance = new BigNumber(500); - const receiverInitialBalance = new BigNumber(0); - const fungibleValueToTransfer = spenderInitialBalance.div(2); + const spenderInitialFungibleBalance = new BigNumber(500); + const receiverInitialFungibleBalance = new BigNumber(0); + const fungibleValueToTransfer = spenderInitialFungibleBalance.div(2); const nonFungibleValueToTransfer = nftOwnerBalance; const receiverCallbackData = '0x01020304'; // tokens & addresses @@ -71,7 +71,7 @@ describe('ERC1155Token', () => { receiver = erc1155Receiver.address; // create wrapper & mint erc1155 tokens erc1155Wrapper = new Erc1155Wrapper(token, provider, owner); - fungibleToken = await erc1155Wrapper.mintFungibleTokenAsync(spender, spenderInitialBalance); + fungibleToken = await erc1155Wrapper.mintFungibleTokenAsync(spender, spenderInitialFungibleBalance); [, nonFungibleToken] = await erc1155Wrapper.mintNonFungibleTokenAsync(spender); }); beforeEach(async () => { @@ -87,15 +87,8 @@ describe('ERC1155Token', () => { const tokenToTransfer = fungibleToken; const valueToTransfer = fungibleValueToTransfer; // check balances before transfer - const expectedInitialBalances = [ - spenderInitialBalance, - receiverInitialBalance, - ]; - await erc1155Wrapper.assertBalancesAsync( - tokenHolders, - [tokenToTransfer], - expectedInitialBalances - ); + const expectedInitialBalances = [spenderInitialFungibleBalance, receiverInitialFungibleBalance]; + await erc1155Wrapper.assertBalancesAsync(tokenHolders, [tokenToTransfer], expectedInitialBalances); // execute transfer await erc1155Wrapper.safeTransferFromAsync( spender, @@ -106,14 +99,10 @@ describe('ERC1155Token', () => { ); // check balances after transfer const expectedFinalBalances = [ - spenderInitialBalance.minus(valueToTransfer), - receiverInitialBalance.plus(valueToTransfer), + spenderInitialFungibleBalance.minus(valueToTransfer), + receiverInitialFungibleBalance.plus(valueToTransfer), ]; - await erc1155Wrapper.assertBalancesAsync( - tokenHolders, - [tokenToTransfer], - expectedFinalBalances - ); + await erc1155Wrapper.assertBalancesAsync(tokenHolders, [tokenToTransfer], expectedFinalBalances); }); it('should transfer non-fungible token if called by token owner', async () => { // setup test parameters @@ -121,15 +110,8 @@ describe('ERC1155Token', () => { const tokenToTransfer = nonFungibleToken; const valueToTransfer = nonFungibleValueToTransfer; // check balances before transfer - const expectedInitialBalances = [ - nftOwnerBalance, - nftNotOwnerBalance - ]; - await erc1155Wrapper.assertBalancesAsync( - tokenHolders, - [tokenToTransfer], - expectedInitialBalances - ); + const expectedInitialBalances = [nftOwnerBalance, nftNotOwnerBalance]; + await erc1155Wrapper.assertBalancesAsync(tokenHolders, [tokenToTransfer], expectedInitialBalances); // execute transfer await erc1155Wrapper.safeTransferFromAsync( spender, @@ -139,15 +121,8 @@ describe('ERC1155Token', () => { receiverCallbackData, ); // check balances after transfer - const expectedFinalBalances = [ - nftNotOwnerBalance, - nftOwnerBalance - ]; - await erc1155Wrapper.assertBalancesAsync( - tokenHolders, - [tokenToTransfer], - expectedFinalBalances - ); + const expectedFinalBalances = [nftNotOwnerBalance, nftOwnerBalance]; + await erc1155Wrapper.assertBalancesAsync(tokenHolders, [tokenToTransfer], expectedFinalBalances); }); it('should trigger callback if transferring to a contract', async () => { // setup test parameters @@ -156,16 +131,12 @@ describe('ERC1155Token', () => { const valueToTransfer = fungibleValueToTransfer; // check balances before transfer const expectedInitialBalances = [ - spenderInitialBalance, - receiverInitialBalance, + spenderInitialFungibleBalance, + receiverInitialFungibleBalance, nftOwnerBalance, - nftNotOwnerBalance + nftNotOwnerBalance, ]; - await erc1155Wrapper.assertBalancesAsync( - tokenHolders, - [tokenToTransfer], - expectedInitialBalances - ); + await erc1155Wrapper.assertBalancesAsync(tokenHolders, [tokenToTransfer], expectedInitialBalances); // execute transfer const tx = await erc1155Wrapper.safeTransferFromAsync( spender, @@ -175,17 +146,15 @@ describe('ERC1155Token', () => { receiverCallbackData, ); expect(tx.logs.length).to.be.equal(2); - const receiverLog = tx.logs[1] as LogWithDecodedArgs< - DummyERC1155ReceiverBatchTokenReceivedEventArgs - >; + const receiverLog = tx.logs[1] as LogWithDecodedArgs; // check callback logs const expectedCallbackLog = { operator: spender, from: spender, tokenId: tokenToTransfer, tokenValue: valueToTransfer, - data: receiverCallbackData - } + data: receiverCallbackData, + }; expect(receiverLog.args.operator).to.be.equal(expectedCallbackLog.operator); expect(receiverLog.args.from).to.be.equal(expectedCallbackLog.from); expect(receiverLog.args.tokenId).to.be.bignumber.equal(expectedCallbackLog.tokenId); @@ -193,19 +162,15 @@ describe('ERC1155Token', () => { expect(receiverLog.args.data).to.be.deep.equal(expectedCallbackLog.data); // check balances after transfer const expectedFinalBalances = [ - spenderInitialBalance.minus(valueToTransfer), - receiverInitialBalance.plus(valueToTransfer), + spenderInitialFungibleBalance.minus(valueToTransfer), + receiverInitialFungibleBalance.plus(valueToTransfer), ]; - await erc1155Wrapper.assertBalancesAsync( - tokenHolders, - [tokenToTransfer], - expectedFinalBalances - ); + await erc1155Wrapper.assertBalancesAsync(tokenHolders, [tokenToTransfer], expectedFinalBalances); }); it('should throw if transfer reverts', async () => { // setup test parameters const tokenToTransfer = fungibleToken; - const valueToTransfer = spenderInitialBalance.plus(1); + const valueToTransfer = spenderInitialFungibleBalance.plus(1); // execute transfer await expectTransactionFailedAsync( token.safeTransferFrom.sendTransactionAsync( @@ -216,7 +181,7 @@ describe('ERC1155Token', () => { receiverCallbackData, { from: spender }, ), - RevertReason.Uint256Underflow + RevertReason.Uint256Underflow, ); }); it('should throw if callback reverts', async () => { @@ -226,14 +191,11 @@ describe('ERC1155Token', () => { // set receiver to reject balances const shouldRejectTransfer = true; await web3Wrapper.awaitTransactionSuccessAsync( - await erc1155Receiver.setRejectTransferFlag.sendTransactionAsync( - shouldRejectTransfer, - - ), + await erc1155Receiver.setRejectTransferFlag.sendTransactionAsync(shouldRejectTransfer), constants.AWAIT_TRANSACTION_MINED_MS, ); - // execute transfer - await expectTransactionFailedAsync( + // execute transfer + await expectTransactionFailedAsync( token.safeTransferFrom.sendTransactionAsync( spender, receiver, @@ -242,7 +204,7 @@ describe('ERC1155Token', () => { receiverCallbackData, { from: spender }, ), - RevertReason.TransferRejected + RevertReason.TransferRejected, ); }); }); @@ -253,15 +215,8 @@ describe('ERC1155Token', () => { const tokensToTransfer = [fungibleToken]; const valuesToTransfer = [fungibleValueToTransfer]; // check balances before transfer - const expectedInitialBalances = [ - spenderInitialBalance, - receiverInitialBalance, - ]; - await erc1155Wrapper.assertBalancesAsync( - tokenHolders, - tokensToTransfer, - expectedInitialBalances - ); + const expectedInitialBalances = [spenderInitialFungibleBalance, receiverInitialFungibleBalance]; + await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances); // execute transfer await erc1155Wrapper.safeBatchTransferFromAsync( spender, @@ -272,14 +227,10 @@ describe('ERC1155Token', () => { ); // check balances after transfer const expectedFinalBalances = [ - spenderInitialBalance.minus(valuesToTransfer[0]), - receiverInitialBalance.plus(valuesToTransfer[0]), + spenderInitialFungibleBalance.minus(valuesToTransfer[0]), + receiverInitialFungibleBalance.plus(valuesToTransfer[0]), ]; - await erc1155Wrapper.assertBalancesAsync( - tokenHolders, - tokensToTransfer, - expectedFinalBalances - ); + await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedFinalBalances); }); it('should transfer non-fungible token if called by token owner', async () => { // setup test parameters @@ -288,16 +239,12 @@ describe('ERC1155Token', () => { const valuesToTransfer = [nonFungibleValueToTransfer]; // check balances before transfer const expectedInitialBalances = [ - spenderInitialBalance, - receiverInitialBalance, + spenderInitialFungibleBalance, + receiverInitialFungibleBalance, nftOwnerBalance, - nftNotOwnerBalance + nftNotOwnerBalance, ]; - await erc1155Wrapper.assertBalancesAsync( - tokenHolders, - tokensToTransfer, - expectedInitialBalances - ); + await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances); // execute transfer await erc1155Wrapper.safeBatchTransferFromAsync( spender, @@ -307,15 +254,8 @@ describe('ERC1155Token', () => { receiverCallbackData, ); // check balances after transfer - const expectedFinalBalances = [ - nftNotOwnerBalance, - nftOwnerBalance - ]; - await erc1155Wrapper.assertBalancesAsync( - tokenHolders, - tokensToTransfer, - expectedFinalBalances - ); + const expectedFinalBalances = [nftNotOwnerBalance, nftOwnerBalance]; + await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedFinalBalances); }); it('should transfer mix of fungible / non-fungible tokens if called by token owner', async () => { // setup test parameters @@ -324,16 +264,12 @@ describe('ERC1155Token', () => { const valuesToTransfer = [fungibleValueToTransfer, nonFungibleValueToTransfer]; // check balances before transfer const expectedInitialBalances = [ - spenderInitialBalance, - receiverInitialBalance, + spenderInitialFungibleBalance, + receiverInitialFungibleBalance, nftOwnerBalance, - nftNotOwnerBalance + nftNotOwnerBalance, ]; - await erc1155Wrapper.assertBalancesAsync( - tokenHolders, - tokensToTransfer, - expectedInitialBalances - ); + await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances); // execute transfer await erc1155Wrapper.safeBatchTransferFromAsync( spender, @@ -344,16 +280,12 @@ describe('ERC1155Token', () => { ); // check balances after transfer const expectedFinalBalances = [ - spenderInitialBalance.minus(valuesToTransfer[0]), - receiverInitialBalance.plus(valuesToTransfer[0]), + spenderInitialFungibleBalance.minus(valuesToTransfer[0]), + receiverInitialFungibleBalance.plus(valuesToTransfer[0]), nftNotOwnerBalance, - nftOwnerBalance + nftOwnerBalance, ]; - await erc1155Wrapper.assertBalancesAsync( - tokenHolders, - tokensToTransfer, - expectedFinalBalances - ); + await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedFinalBalances); }); it('should trigger callback if transferring to a contract', async () => { // setup test parameters @@ -362,16 +294,12 @@ describe('ERC1155Token', () => { const valuesToTransfer = [fungibleValueToTransfer, nonFungibleValueToTransfer]; // check balances before transfer const expectedInitialBalances = [ - spenderInitialBalance, - receiverInitialBalance, + spenderInitialFungibleBalance, + receiverInitialFungibleBalance, nftOwnerBalance, - nftNotOwnerBalance + nftNotOwnerBalance, ]; - await erc1155Wrapper.assertBalancesAsync( - tokenHolders, - tokensToTransfer, - expectedInitialBalances - ); + await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances); // execute transfer const tx = await erc1155Wrapper.safeBatchTransferFromAsync( spender, @@ -381,17 +309,15 @@ describe('ERC1155Token', () => { receiverCallbackData, ); expect(tx.logs.length).to.be.equal(2); - const receiverLog = tx.logs[1] as LogWithDecodedArgs< - DummyERC1155ReceiverBatchTokenReceivedEventArgs - >; + const receiverLog = tx.logs[1] as LogWithDecodedArgs; // check callback logs const expectedCallbackLog = { operator: spender, from: spender, tokenIds: tokensToTransfer, tokenValues: valuesToTransfer, - data: receiverCallbackData - } + data: receiverCallbackData, + }; expect(receiverLog.args.operator).to.be.equal(expectedCallbackLog.operator); expect(receiverLog.args.from).to.be.equal(expectedCallbackLog.from); expect(receiverLog.args.tokenIds.length).to.be.equal(2); @@ -403,21 +329,17 @@ describe('ERC1155Token', () => { expect(receiverLog.args.data).to.be.deep.equal(expectedCallbackLog.data); // check balances after transfer const expectedFinalBalances = [ - spenderInitialBalance.minus(valuesToTransfer[0]), - receiverInitialBalance.plus(valuesToTransfer[0]), + spenderInitialFungibleBalance.minus(valuesToTransfer[0]), + receiverInitialFungibleBalance.plus(valuesToTransfer[0]), nftNotOwnerBalance, - nftOwnerBalance + nftOwnerBalance, ]; - await erc1155Wrapper.assertBalancesAsync( - tokenHolders, - tokensToTransfer, - expectedFinalBalances - ); + await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedFinalBalances); }); it('should throw if transfer reverts', async () => { // setup test parameters const tokensToTransfer = [fungibleToken]; - const valuesToTransfer = [spenderInitialBalance.plus(1)]; + const valuesToTransfer = [spenderInitialFungibleBalance.plus(1)]; // execute transfer await expectTransactionFailedAsync( token.safeBatchTransferFrom.sendTransactionAsync( @@ -428,7 +350,7 @@ describe('ERC1155Token', () => { receiverCallbackData, { from: spender }, ), - RevertReason.Uint256Underflow + RevertReason.Uint256Underflow, ); }); it('should throw if callback reverts', async () => { @@ -438,14 +360,11 @@ describe('ERC1155Token', () => { // set receiver to reject balances const shouldRejectTransfer = true; await web3Wrapper.awaitTransactionSuccessAsync( - await erc1155Receiver.setRejectTransferFlag.sendTransactionAsync( - shouldRejectTransfer, - - ), + await erc1155Receiver.setRejectTransferFlag.sendTransactionAsync(shouldRejectTransfer), constants.AWAIT_TRANSACTION_MINED_MS, ); - // execute transfer - await expectTransactionFailedAsync( + // execute transfer + await expectTransactionFailedAsync( token.safeBatchTransferFrom.sendTransactionAsync( spender, receiver, @@ -454,7 +373,7 @@ describe('ERC1155Token', () => { receiverCallbackData, { from: spender }, ), - RevertReason.TransferRejected + RevertReason.TransferRejected, ); }); }); diff --git a/contracts/erc1155/test/utils/erc1155_wrapper.ts b/contracts/erc1155/test/utils/erc1155_wrapper.ts index f0c252d3ee..db23cc95c9 100644 --- a/contracts/erc1155/test/utils/erc1155_wrapper.ts +++ b/contracts/erc1155/test/utils/erc1155_wrapper.ts @@ -32,30 +32,31 @@ export class Erc1155Wrapper { this._contractOwner = contractOwner; this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts); } - public async getBalancesAsync( - owners: string[], - tokens: BigNumber[] - ): Promise { - const balances = await this._erc1155Contract.balanceOfBatch.callAsync( - owners, - tokens, - ); + public async getBalancesAsync(owners: string[], tokens: BigNumber[]): Promise { + const balances = await this._erc1155Contract.balanceOfBatch.callAsync(owners, tokens); return balances; } - public async safeTransferFromAsync(from: string, to: string, token: BigNumber, value: BigNumber, callbackData: string = '0x'): Promise { + public async safeTransferFromAsync( + from: string, + to: string, + token: BigNumber, + value: BigNumber, + callbackData: string = '0x', + ): Promise { const tx = await this._logDecoder.getTxWithDecodedLogsAsync( - await this._erc1155Contract.safeTransferFrom.sendTransactionAsync( + await this._erc1155Contract.safeTransferFrom.sendTransactionAsync(from, to, token, value, callbackData, { from, - to, - token, - value, - callbackData, - { from }, - ), + }), ); return tx; } - public async safeBatchTransferFromAsync(from: string, to: string, tokens: BigNumber[], values: BigNumber[], callbackData: string = '0x'): Promise { + public async safeBatchTransferFromAsync( + from: string, + to: string, + tokens: BigNumber[], + values: BigNumber[], + callbackData: string = '0x', + ): Promise { const tx = await this._logDecoder.getTxWithDecodedLogsAsync( await this._erc1155Contract.safeBatchTransferFrom.sendTransactionAsync( from, @@ -72,7 +73,9 @@ export class Erc1155Wrapper { const tokenUri = 'dummyFungibleToken'; const tokenIsNonFungible = false; const tx = await this._logDecoder.getTxWithDecodedLogsAsync( - await this._erc1155Contract.create.sendTransactionAsync(tokenUri, tokenIsNonFungible, { from: this._contractOwner }) + await this._erc1155Contract.create.sendTransactionAsync(tokenUri, tokenIsNonFungible, { + from: this._contractOwner, + }), ); const createFungibleTokenLog = tx.logs[0] as LogWithDecodedArgs; const token = createFungibleTokenLog.args._id; @@ -84,33 +87,39 @@ export class Erc1155Wrapper { ); return token; } - public async mintNonFungibleTokenAsync(beneficiary: string): Promise<[BigNumber,BigNumber]> { + public async mintNonFungibleTokenAsync(beneficiary: string): Promise<[BigNumber, BigNumber]> { const tokenUri = 'dummyNonFungibleToken'; const tokenIsNonFungible = true; const tx = await this._logDecoder.getTxWithDecodedLogsAsync( - await this._erc1155Contract.create.sendTransactionAsync(tokenUri, tokenIsNonFungible, { from: this._contractOwner }) + await this._erc1155Contract.create.sendTransactionAsync(tokenUri, tokenIsNonFungible, { + from: this._contractOwner, + }), ); const createFungibleTokenLog = tx.logs[0] as LogWithDecodedArgs; const token = createFungibleTokenLog.args._id; await this._web3Wrapper.awaitTransactionSuccessAsync( - await this._erc1155Contract.mintNonFungible.sendTransactionAsync(token, [beneficiary], { from: this._contractOwner }), + await this._erc1155Contract.mintNonFungible.sendTransactionAsync(token, [beneficiary], { + from: this._contractOwner, + }), constants.AWAIT_TRANSACTION_MINED_MS, ); const nftId = token.plus(1); return [token, nftId]; } - public async assertBalancesAsync(owners: string[], tokens: BigNumber[], expectedBalances: BigNumber[]): Promise { + public async assertBalancesAsync( + owners: string[], + tokens: BigNumber[], + expectedBalances: BigNumber[], + ): Promise { const ownersExtended: string[] = []; const tokensExtended: BigNumber[] = []; _.each(tokens, (token: BigNumber) => { ownersExtended.concat(owners); - _.range(0, owners.length, () => {tokensExtended.push(token)}); - + _.range(0, owners.length, () => { + tokensExtended.push(token); + }); }); - const balances = await this.getBalancesAsync( - ownersExtended, - tokensExtended, - ); + const balances = await this.getBalancesAsync(ownersExtended, tokensExtended); _.each(balances, (balance: BigNumber, i: number) => { expect(balance, `${ownersExtended[i]}${tokensExtended[i]}`).to.be.bignumber.equal(expectedBalances[i]); });