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

Ran prettier

Browse Source
This commit is contained in:
Greg Hysen
2019-03-05 07:42:01 -08:00
parent 4b60d941cc
commit 421f555d57
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contracts/erc1155/test/erc1155_token.ts
View File

@@ -238,10 +238,7 @@ describe('ERC1155Token', () => {
const tokensToTransfer = [nonFungibleToken]; const tokensToTransfer = [nonFungibleToken];
const valuesToTransfer = [nonFungibleValueToTransfer]; const valuesToTransfer = [nonFungibleValueToTransfer];
// check balances before transfer // check balances before transfer
const expectedInitialBalances = [ const expectedInitialBalances = [nftOwnerBalance, nftNotOwnerBalance];
nftOwnerBalance,
nftNotOwnerBalance,
];
await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances); await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances);
// execute transfer // execute transfer
await erc1155Wrapper.safeBatchTransferFromAsync( await erc1155Wrapper.safeBatchTransferFromAsync(

15
contracts/erc1155/test/utils/erc1155_wrapper.ts
View File

@@ -1,11 +1,9 @@
import { constants, LogDecoder } from '@0x/contracts-test-utils'; import { constants, LogDecoder } from '@0x/contracts-test-utils';
import { BigNumber } from '@0x/utils';
import { Web3Wrapper } from '@0x/web3-wrapper'; import { Web3Wrapper } from '@0x/web3-wrapper';
import * as chai from 'chai'; import * as chai from 'chai';
import { LogWithDecodedArgs, TransactionReceiptWithDecodedLogs } from 'ethereum-types'; import { LogWithDecodedArgs, Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
import * as _ from 'lodash'; import * as _ from 'lodash';
import { Provider } from 'ethereum-types';
import { BigNumber } from '@0x/utils';
import { artifacts, ERC1155MintableContract, ERC1155TransferSingleEventArgs } from '../../src'; import { artifacts, ERC1155MintableContract, ERC1155TransferSingleEventArgs } from '../../src';
@@ -67,7 +65,10 @@ export class Erc1155Wrapper {
); );
return tx; return tx;
} }
public async mintFungibleTokensAsync(beneficiaries: string[], tokenAmounts: BigNumber | BigNumber[]): Promise<BigNumber> { public async mintFungibleTokensAsync(
beneficiaries: string[],
tokenAmounts: BigNumber | BigNumber[],
): Promise<BigNumber> {
const tokenUri = 'dummyFungibleToken'; const tokenUri = 'dummyFungibleToken';
const tokenIsNonFungible = false; const tokenIsNonFungible = false;
const tx = await this._logDecoder.getTxWithDecodedLogsAsync( const tx = await this._logDecoder.getTxWithDecodedLogsAsync(
@@ -80,7 +81,9 @@ export class Erc1155Wrapper {
const token = createFungibleTokenLog.args.id; const token = createFungibleTokenLog.args.id;
const tokenAmountsAsArray = _.isArray(tokenAmounts) ? tokenAmounts : []; const tokenAmountsAsArray = _.isArray(tokenAmounts) ? tokenAmounts : [];
if (!_.isArray(tokenAmounts)) { if (!_.isArray(tokenAmounts)) {
_.each(_.range(0, beneficiaries.length), () => {tokenAmountsAsArray.push(tokenAmounts)}); _.each(_.range(0, beneficiaries.length), () => {
tokenAmountsAsArray.push(tokenAmounts);
});
} }
await this._web3Wrapper.awaitTransactionSuccessAsync( await this._web3Wrapper.awaitTransactionSuccessAsync(
await this._erc1155Contract.mintFungible.sendTransactionAsync(token, beneficiaries, tokenAmountsAsArray, { await this._erc1155Contract.mintFungible.sendTransactionAsync(token, beneficiaries, tokenAmountsAsArray, {