diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-02-24 05:05:23 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-02-28 04:05:46 +0800 |
| commit | fa822caa626f6bca6d7960f9f0cddd8376b63157 (patch) | |
| tree | 0342ca304fab987b8c0cb95e8ce46d74313bbd1a | |
| parent | ddc30cc2c0a81e1c459bf2bd7eb6623f9262a801 (diff) | |
| download | dexon-sol-tools-fa822caa626f6bca6d7960f9f0cddd8376b63157.tar dexon-sol-tools-fa822caa626f6bca6d7960f9f0cddd8376b63157.tar.gz dexon-sol-tools-fa822caa626f6bca6d7960f9f0cddd8376b63157.tar.bz2 dexon-sol-tools-fa822caa626f6bca6d7960f9f0cddd8376b63157.tar.lz dexon-sol-tools-fa822caa626f6bca6d7960f9f0cddd8376b63157.tar.xz dexon-sol-tools-fa822caa626f6bca6d7960f9f0cddd8376b63157.tar.zst dexon-sol-tools-fa822caa626f6bca6d7960f9f0cddd8376b63157.zip | |
Apply prettier after generating contracts
| -rw-r--r-- | packages/contracts/package.json | 2 | ||||
| -rw-r--r-- | packages/contracts/src/contract_wrappers/generated/base_contract.ts | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/contracts/package.json b/packages/contracts/package.json index f35ba73c2..ddd8ade55 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -17,7 +17,7 @@ "compile:comment": "Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846", "compile": "node ../deployer/lib/src/cli.js compile --contracts ${npm_package_config_contracts} --contracts-dir src/contracts --artifacts-dir src/artifacts", "clean": "shx rm -rf ./lib", - "generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis 'src/artifacts/@(DummyToken|TokenTransferProxy|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken).json' --template contract_templates/contract.handlebars --partials 'contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend web3", + "generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis 'src/artifacts/@(DummyToken|TokenTransferProxy|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken).json' --template contract_templates/contract.handlebars --partials 'contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend web3 && prettier --write 'src/contract_wrappers/generated/**.ts'", "migrate": "node ../deployer/lib/src/cli.js migrate", "lint": "tslint --project . 'migrations/**/*.ts' 'test/**/*.ts' 'util/**/*.ts' 'deploy/**/*.ts'", "test:circleci": "yarn test" diff --git a/packages/contracts/src/contract_wrappers/generated/base_contract.ts b/packages/contracts/src/contract_wrappers/generated/base_contract.ts index 2d77b3ab1..d492bd325 100644 --- a/packages/contracts/src/contract_wrappers/generated/base_contract.ts +++ b/packages/contracts/src/contract_wrappers/generated/base_contract.ts @@ -1,4 +1,4 @@ -import {TxData, TxDataPayable} from '@0xproject/types'; +import { TxData, TxDataPayable } from '@0xproject/types'; import * as _ from 'lodash'; import * as Web3 from 'web3'; @@ -6,7 +6,7 @@ export class BaseContract { public address: string; protected _web3ContractInstance: Web3.ContractInstance; protected _defaults: Partial<TxData>; - protected async _applyDefaultsToTxDataAsync<T extends TxData|TxDataPayable>( + protected async _applyDefaultsToTxDataAsync<T extends TxData | TxDataPayable>( txData: T, estimateGasAsync?: (txData: T) => Promise<number>, ): Promise<TxData> { |