diff options
| author | Leonid <logvinov.leon@gmail.com> | 2018-02-12 22:01:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-12 22:01:24 +0800 |
| commit | 7f1e789264e2b67c7feffc633bd64caa257657cc (patch) | |
| tree | 721cee22fbc45c71ea21fd296dda88c0a03d75a5 /packages/deployer/src | |
| parent | ba57c34adb0348af61210aa0bbee3e734b477f58 (diff) | |
| parent | 07d00cc515e0f9825b81595386b358593b7a3d6f (diff) | |
| download | dexon-sol-tools-7f1e789264e2b67c7feffc633bd64caa257657cc.tar dexon-sol-tools-7f1e789264e2b67c7feffc633bd64caa257657cc.tar.gz dexon-sol-tools-7f1e789264e2b67c7feffc633bd64caa257657cc.tar.bz2 dexon-sol-tools-7f1e789264e2b67c7feffc633bd64caa257657cc.tar.lz dexon-sol-tools-7f1e789264e2b67c7feffc633bd64caa257657cc.tar.xz dexon-sol-tools-7f1e789264e2b67c7feffc633bd64caa257657cc.tar.zst dexon-sol-tools-7f1e789264e2b67c7feffc633bd64caa257657cc.zip | |
Merge branch 'development' into fix/windows_install
Diffstat (limited to 'packages/deployer/src')
| -rw-r--r-- | packages/deployer/src/commands.ts | 2 | ||||
| -rw-r--r-- | packages/deployer/src/globals.d.ts | 3 | ||||
| -rw-r--r-- | packages/deployer/src/migrations/config/token_info.ts | 2 | ||||
| -rw-r--r-- | packages/deployer/src/migrations/migrate.ts | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/packages/deployer/src/commands.ts b/packages/deployer/src/commands.ts index 2acef8e8f..d1707c5ed 100644 --- a/packages/deployer/src/commands.ts +++ b/packages/deployer/src/commands.ts @@ -1,6 +1,6 @@ -import { migrator } from './migrations/migrate'; import { Compiler } from './compiler'; import { Deployer } from './deployer'; +import { migrator } from './migrations/migrate'; import { CompilerOptions, DeployerOptions } from './utils/types'; export const commands = { diff --git a/packages/deployer/src/globals.d.ts b/packages/deployer/src/globals.d.ts index 0a35002da..2e04d83ea 100644 --- a/packages/deployer/src/globals.d.ts +++ b/packages/deployer/src/globals.d.ts @@ -1,8 +1,11 @@ declare module 'solc' { + // tslint:disable:completed-docs export function compile(sources: any, optimizerEnabled: number, findImports: (importPath: string) => any): any; export function setupMethods(solcBin: any): any; + // tslint:enable:completed-docs } declare module 'web3-eth-abi' { + // tslint:disable-next-line:completed-docs export function encodeParameters(typesArray: string[], parameters: any[]): string; } diff --git a/packages/deployer/src/migrations/config/token_info.ts b/packages/deployer/src/migrations/config/token_info.ts index 7e822fc3b..a815f5801 100644 --- a/packages/deployer/src/migrations/config/token_info.ts +++ b/packages/deployer/src/migrations/config/token_info.ts @@ -1,5 +1,5 @@ -import { constants } from '../../utils/constants'; import { Token } from '../../types'; +import { constants } from '../../utils/constants'; export const tokenInfo: Token[] = [ { diff --git a/packages/deployer/src/migrations/migrate.ts b/packages/deployer/src/migrations/migrate.ts index 393806b45..d3b397f0a 100644 --- a/packages/deployer/src/migrations/migrate.ts +++ b/packages/deployer/src/migrations/migrate.ts @@ -4,6 +4,7 @@ import * as _ from 'lodash'; import { Deployer } from '../deployer'; import { constants } from '../utils/constants'; + import { tokenInfo } from './config/token_info'; export const migrator = { |