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

Ran linter

Browse Source
This commit is contained in:
Greg Hysen 2018-12-23 21:54:51 -08:00
parent 05adb38a09
commit f39c03191c
5 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contracts/protocol/test/utils/exchange_wrapper.ts
View File

@ -7,12 +7,11 @@ import {
SignedTransaction, SignedTransaction,
} from '@0x/contracts-test-utils'; } from '@0x/contracts-test-utils';
import { artifacts as tokensArtifacts } from '@0x/contracts-tokens'; import { artifacts as tokensArtifacts } from '@0x/contracts-tokens';
import { OrderWithoutExchangeAddress, SignedOrder } from '@0x/types'; import { SignedOrder } from '@0x/types';
import { BigNumber } from '@0x/utils'; import { AbiEncoder, BigNumber } from '@0x/utils';
import { Web3Wrapper } from '@0x/web3-wrapper'; import { Web3Wrapper } from '@0x/web3-wrapper';
import { AbiDefinition, MethodAbi, Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types'; import { AbiDefinition, MethodAbi, Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
import * as _ from 'lodash'; import * as _ from 'lodash';
import { AbiEncoder } from '@0x/utils';
import { ExchangeContract } from '../../generated-wrappers/exchange'; import { ExchangeContract } from '../../generated-wrappers/exchange';
import { artifacts } from '../../src/artifacts'; import { artifacts } from '../../src/artifacts';
@ -279,12 +278,10 @@ export class ExchangeWrapper {
); );
return data; return data;
} }
public abiDecodeFillOrder( public abiDecodeFillOrder(data: string): AbiDecodedFillOrderData {
data: string,
): AbiDecodedFillOrderData {
// Lookup fillOrder ABI // Lookup fillOrder ABI
let fillOrderAbi = _.find(this._exchange.abi, (value: AbiDefinition) => { const fillOrderAbi = _.find(this._exchange.abi, (value: AbiDefinition) => {
if (value.type === 'function' && (value as MethodAbi).name === 'fillOrder') { if (value.type === 'function' && (value as any).name === 'fillOrder') {
return true; return true;
} }
return false; return false;

1
contracts/protocol/test/utils/fill_order_combinatorial_utils.ts
View File

@ -42,7 +42,6 @@ import { ExchangeWrapper } from './exchange_wrapper';
import { OrderFactoryFromScenario } from './order_factory_from_scenario'; import { OrderFactoryFromScenario } from './order_factory_from_scenario';
import { SimpleAssetBalanceAndProxyAllowanceFetcher } from './simple_asset_balance_and_proxy_allowance_fetcher'; import { SimpleAssetBalanceAndProxyAllowanceFetcher } from './simple_asset_balance_and_proxy_allowance_fetcher';
import { SimpleOrderFilledCancelledFetcher } from './simple_order_filled_cancelled_fetcher'; import { SimpleOrderFilledCancelledFetcher } from './simple_order_filled_cancelled_fetcher';
import { Method } from '@0x/utils/lib/src/abi_encoder';
chaiSetup.configure(); chaiSetup.configure();
const expect = chai.expect; const expect = chai.expect;

4
contracts/protocol/test/utils/types.ts
View File

@ -2,7 +2,7 @@ import { SignedOrder } from '@0x/types';
import { BigNumber } from '@0x/utils'; import { BigNumber } from '@0x/utils';
export interface AbiDecodedFillOrderData { export interface AbiDecodedFillOrderData {
order: SignedOrder; order: SignedOrder;
akerAssetFillAmount: BigNumber; akerAssetFillAmount: BigNumber;
signature: string; signature: string;
} }

12
packages/base-contract/src/index.ts
View File

@ -1,6 +1,16 @@
import { AbiEncoder, abiUtils } from '@0x/utils'; import { AbiEncoder, abiUtils } from '@0x/utils';
import { Web3Wrapper } from '@0x/web3-wrapper'; import { Web3Wrapper } from '@0x/web3-wrapper';
import { AbiDefinition, AbiType, ConstructorAbi, ContractAbi, DataItem, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types'; import {
AbiDefinition,
AbiType,
ConstructorAbi,
ContractAbi,
DataItem,
MethodAbi,
Provider,
TxData,
TxDataPayable,
} from 'ethereum-types';
import * as ethers from 'ethers'; import * as ethers from 'ethers';
import * as _ from 'lodash'; import * as _ from 'lodash';

1
packages/utils/src/abi_encoder/evm_data_types/tuple.ts
View File

@ -5,7 +5,6 @@ import { DataTypeFactory } from '../abstract_data_types/interfaces';
import { AbstractSetDataType } from '../abstract_data_types/types/set'; import { AbstractSetDataType } from '../abstract_data_types/types/set';
export class TupleDataType extends AbstractSetDataType { export class TupleDataType extends AbstractSetDataType {
public static matchType(type: string): boolean { public static matchType(type: string): boolean {
return type === SolidityTypes.Tuple; return type === SolidityTypes.Tuple;
} }