From 13299158d1e22d1af1cd36434fc403a74743ecb1 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Sun, 4 Mar 2018 19:05:26 -0800 Subject: Add sol-cover implementation --- packages/deployer/src/utils/constants.ts | 1 - packages/deployer/src/utils/types.ts | 23 ++++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) (limited to 'packages/deployer/src/utils') diff --git a/packages/deployer/src/utils/constants.ts b/packages/deployer/src/utils/constants.ts index 57f30dec8..85923448f 100644 --- a/packages/deployer/src/utils/constants.ts +++ b/packages/deployer/src/utils/constants.ts @@ -1,4 +1,3 @@ export const constants = { - NULL_BYTES: '0x', SOLIDITY_FILE_EXTENSION: '.sol', }; diff --git a/packages/deployer/src/utils/types.ts b/packages/deployer/src/utils/types.ts index a3f722976..ca2f8af0c 100644 --- a/packages/deployer/src/utils/types.ts +++ b/packages/deployer/src/utils/types.ts @@ -24,10 +24,14 @@ export interface ContractNetworkData { keccak256: string; source_tree_hash: string; abi: Web3.ContractAbi; - unlinked_binary: string; + bytecode: string; + runtime_bytecode: string; address?: string; constructor_args?: string; updated_at: number; + source_map: string; + source_map_runtime: string; + sources: string[]; } export interface SolcErrors { @@ -54,13 +58,22 @@ export interface CompilerOptions { specifiedContracts: Set; } -export interface DeployerOptions { +export interface BaseDeployerOptions { artifactsDir: string; - jsonrpcPort: number; networkId: number; defaults: Partial; } +export interface ProviderDeployerOptions extends BaseDeployerOptions { + web3Provider: Web3.Provider; +} + +export interface PortDeployerOptions extends BaseDeployerOptions { + jsonrpcPort: number; +} + +export type DeployerOptions = PortDeployerOptions | ProviderDeployerOptions; + export interface ContractSources { [key: string]: string; } @@ -76,10 +89,6 @@ export interface ContractSpecificSourceData { sourceTreeHashIfExists?: Buffer; } -export interface ImportContents { - contents: string; -} - // TODO: Consolidate with 0x.js definitions once types are moved into a separate package. export enum ZeroExError { ContractDoesNotExist = 'CONTRACT_DOES_NOT_EXIST', -- cgit v1.2.3