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

Apply prettier

Browse Source
This commit is contained in:
Leonid Logvinov 2019-01-14 20:30:18 +01:00
parent a084bbbed8
commit 61c88455f4
No known key found for this signature in database
GPG Key ID: 0DD294BFDE8C95D4
4 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
contracts/protocol/test/exchange/wrapper.ts
View File

@ -493,15 +493,15 @@ describe('Exchange wrappers', () => {
erc20Balances[makerAddress][makerAssetAddress] = erc20Balances[makerAddress][ erc20Balances[makerAddress][makerAssetAddress] = erc20Balances[makerAddress][
makerAssetAddress makerAssetAddress
].minus(makerAssetFilledAmount); ].minus(makerAssetFilledAmount);
erc20Balances[makerAddress][takerAssetAddress] = erc20Balances[makerAddress][takerAssetAddress].plus( erc20Balances[makerAddress][takerAssetAddress] = erc20Balances[makerAddress][
takerAssetFillAmount, takerAssetAddress
); ].plus(takerAssetFillAmount);
erc20Balances[makerAddress][zrxToken.address] = erc20Balances[makerAddress][zrxToken.address].minus( erc20Balances[makerAddress][zrxToken.address] = erc20Balances[makerAddress][zrxToken.address].minus(
makerFee, makerFee,
); );
erc20Balances[takerAddress][makerAssetAddress] = erc20Balances[takerAddress][makerAssetAddress].plus( erc20Balances[takerAddress][makerAssetAddress] = erc20Balances[takerAddress][
makerAssetFilledAmount, makerAssetAddress
); ].plus(makerAssetFilledAmount);
erc20Balances[takerAddress][takerAssetAddress] = erc20Balances[takerAddress][ erc20Balances[takerAddress][takerAssetAddress] = erc20Balances[takerAddress][
takerAssetAddress takerAssetAddress
].minus(takerAssetFillAmount); ].minus(takerAssetFillAmount);
@ -562,15 +562,15 @@ describe('Exchange wrappers', () => {
erc20Balances[makerAddress][makerAssetAddress] = erc20Balances[makerAddress][ erc20Balances[makerAddress][makerAssetAddress] = erc20Balances[makerAddress][
makerAssetAddress makerAssetAddress
].minus(makerAssetFilledAmount); ].minus(makerAssetFilledAmount);
erc20Balances[makerAddress][takerAssetAddress] = erc20Balances[makerAddress][takerAssetAddress].plus( erc20Balances[makerAddress][takerAssetAddress] = erc20Balances[makerAddress][
takerAssetFillAmount, takerAssetAddress
); ].plus(takerAssetFillAmount);
erc20Balances[makerAddress][zrxToken.address] = erc20Balances[makerAddress][zrxToken.address].minus( erc20Balances[makerAddress][zrxToken.address] = erc20Balances[makerAddress][zrxToken.address].minus(
makerFee, makerFee,
); );
erc20Balances[takerAddress][makerAssetAddress] = erc20Balances[takerAddress][makerAssetAddress].plus( erc20Balances[takerAddress][makerAssetAddress] = erc20Balances[takerAddress][
makerAssetFilledAmount, makerAssetAddress
); ].plus(makerAssetFilledAmount);
erc20Balances[takerAddress][takerAssetAddress] = erc20Balances[takerAddress][ erc20Balances[takerAddress][takerAssetAddress] = erc20Balances[takerAddress][
takerAssetAddress takerAssetAddress
].minus(takerAssetFillAmount); ].minus(takerAssetFillAmount);
@ -647,15 +647,15 @@ describe('Exchange wrappers', () => {
erc20Balances[makerAddress][makerAssetAddress] = erc20Balances[makerAddress][ erc20Balances[makerAddress][makerAssetAddress] = erc20Balances[makerAddress][
makerAssetAddress makerAssetAddress
].minus(makerAssetFilledAmount); ].minus(makerAssetFilledAmount);
erc20Balances[makerAddress][takerAssetAddress] = erc20Balances[makerAddress][takerAssetAddress].plus( erc20Balances[makerAddress][takerAssetAddress] = erc20Balances[makerAddress][
takerAssetFillAmount, takerAssetAddress
); ].plus(takerAssetFillAmount);
erc20Balances[makerAddress][zrxToken.address] = erc20Balances[makerAddress][zrxToken.address].minus( erc20Balances[makerAddress][zrxToken.address] = erc20Balances[makerAddress][zrxToken.address].minus(
makerFee, makerFee,
); );
erc20Balances[takerAddress][makerAssetAddress] = erc20Balances[takerAddress][makerAssetAddress].plus( erc20Balances[takerAddress][makerAssetAddress] = erc20Balances[takerAddress][
makerAssetFilledAmount, makerAssetAddress
); ].plus(makerAssetFilledAmount);
erc20Balances[takerAddress][takerAssetAddress] = erc20Balances[takerAddress][ erc20Balances[takerAddress][takerAssetAddress] = erc20Balances[takerAddress][
takerAssetAddress takerAssetAddress
].minus(takerAssetFillAmount); ].minus(takerAssetFillAmount);
@ -706,15 +706,15 @@ describe('Exchange wrappers', () => {
erc20Balances[makerAddress][makerAssetAddress] = erc20Balances[makerAddress][ erc20Balances[makerAddress][makerAssetAddress] = erc20Balances[makerAddress][
makerAssetAddress makerAssetAddress
].minus(makerAssetFilledAmount); ].minus(makerAssetFilledAmount);
erc20Balances[makerAddress][takerAssetAddress] = erc20Balances[makerAddress][takerAssetAddress].plus( erc20Balances[makerAddress][takerAssetAddress] = erc20Balances[makerAddress][
takerAssetFillAmount, takerAssetAddress
); ].plus(takerAssetFillAmount);
erc20Balances[makerAddress][zrxToken.address] = erc20Balances[makerAddress][zrxToken.address].minus( erc20Balances[makerAddress][zrxToken.address] = erc20Balances[makerAddress][zrxToken.address].minus(
makerFee, makerFee,
); );
erc20Balances[takerAddress][makerAssetAddress] = erc20Balances[takerAddress][makerAssetAddress].plus( erc20Balances[takerAddress][makerAssetAddress] = erc20Balances[takerAddress][
makerAssetFilledAmount, makerAssetAddress
); ].plus(makerAssetFilledAmount);
erc20Balances[takerAddress][takerAssetAddress] = erc20Balances[takerAddress][ erc20Balances[takerAddress][takerAssetAddress] = erc20Balances[takerAddress][
takerAssetAddress takerAssetAddress
].minus(takerAssetFillAmount); ].minus(takerAssetFillAmount);

4
packages/asset-buyer/src/utils/buy_quote_calculator.ts
View File

@ -43,7 +43,9 @@ export const buyQuoteCalculator = {
const multiplierNeededWithSlippage = new BigNumber(1).plus(slippagePercentage); const multiplierNeededWithSlippage = new BigNumber(1).plus(slippagePercentage);
// Given amountAvailableToFillConsideringSlippage * multiplierNeededWithSlippage = amountAbleToFill // Given amountAvailableToFillConsideringSlippage * multiplierNeededWithSlippage = amountAbleToFill
// We divide amountUnableToFill by multiplierNeededWithSlippage to determine amountAvailableToFillConsideringSlippage // We divide amountUnableToFill by multiplierNeededWithSlippage to determine amountAvailableToFillConsideringSlippage
const amountAvailableToFillConsideringSlippage = amountAbleToFill.div(multiplierNeededWithSlippage).integerValue(BigNumber.ROUND_FLOOR); const amountAvailableToFillConsideringSlippage = amountAbleToFill
.div(multiplierNeededWithSlippage)
.integerValue(BigNumber.ROUND_FLOOR);
throw new InsufficientAssetLiquidityError(amountAvailableToFillConsideringSlippage); throw new InsufficientAssetLiquidityError(amountAvailableToFillConsideringSlippage);
} }

5
packages/instant/src/util/asset.ts
View File

@ -104,9 +104,8 @@ export const assetUtils = {
return assetDataGroupIfExists[Network.Mainnet]; return assetDataGroupIfExists[Network.Mainnet];
}, },
getERC20AssetsFromAssets: (assets: Asset[]): ERC20Asset[] => { getERC20AssetsFromAssets: (assets: Asset[]): ERC20Asset[] => {
const erc20sOrUndefined = _.map( const erc20sOrUndefined = _.map(assets, asset =>
assets, asset.metaData.assetProxyId === AssetProxyId.ERC20 ? (asset as ERC20Asset) : undefined,
asset => (asset.metaData.assetProxyId === AssetProxyId.ERC20 ? (asset as ERC20Asset) : undefined),
); );
return _.compact(erc20sOrUndefined); return _.compact(erc20sOrUndefined);
}, },

4
packages/testnet-faucets/src/ts/handler.ts
View File

@ -179,7 +179,9 @@ export class Handler {
feeRecipientAddress: NULL_ADDRESS, feeRecipientAddress: NULL_ADDRESS,
senderAddress: NULL_ADDRESS, senderAddress: NULL_ADDRESS,
// tslint:disable-next-line:custom-no-magic-numbers // tslint:disable-next-line:custom-no-magic-numbers
expirationTimeSeconds: new BigNumber(Date.now() + FIVE_DAYS_IN_MS).div(1000).integerValue(BigNumber.ROUND_FLOOR), expirationTimeSeconds: new BigNumber(Date.now() + FIVE_DAYS_IN_MS)
.div(1000)
.integerValue(BigNumber.ROUND_FLOOR),
}; };
const orderHash = orderHashUtils.getOrderHashHex(order); const orderHash = orderHashUtils.getOrderHashHex(order);
const signature = await signatureUtils.ecSignHashAsync( const signature = await signatureUtils.ecSignHashAsync(