From 1a3958ed602a2abd55a41289fddd2ee1d930d159 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 30 May 2018 11:35:22 -0700 Subject: Remove some types --- packages/sol-cov/package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/sol-cov') diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index f18315a26..67c570bd4 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -67,6 +67,7 @@ "@types/istanbul": "^0.4.30", "@types/loglevel": "^1.5.3", "@types/mkdirp": "^0.5.1", + "@types/solidity-parser-antlr": "^0.2.0", "@types/mocha": "^2.2.42", "@types/node": "^8.0.53", "@types/rimraf": "^2.0.2", -- cgit v1.2.3 From a7fc9caacb7b98c7d79333e60ee9862945a67ecc Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 30 May 2018 14:41:36 -0700 Subject: Introduce ethereum-types package --- packages/sol-cov/package.json | 2 +- packages/sol-cov/src/coverage_subprovider.ts | 2 +- packages/sol-cov/src/trace.ts | 2 +- packages/sol-cov/test/trace_test.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages/sol-cov') diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index 67c570bd4..8f272a00c 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -48,9 +48,9 @@ "dependencies": { "@0xproject/sol-compiler": "^0.5.0", "@0xproject/subproviders": "^0.10.2", - "@0xproject/types": "^0.7.0", "@0xproject/typescript-typings": "^0.3.2", "@0xproject/utils": "^0.6.2", + "ethereum-types": "^0.0.1", "ethereumjs-util": "^5.1.1", "glob": "^7.1.2", "istanbul": "^0.4.5", diff --git a/packages/sol-cov/src/coverage_subprovider.ts b/packages/sol-cov/src/coverage_subprovider.ts index 438339a3f..ca7f4aed2 100644 --- a/packages/sol-cov/src/coverage_subprovider.ts +++ b/packages/sol-cov/src/coverage_subprovider.ts @@ -1,5 +1,5 @@ import { Callback, ErrorCallback, NextCallback, Subprovider } from '@0xproject/subproviders'; -import { BlockParam, CallData, JSONRPCRequestPayload, TransactionTrace, TxData } from '@0xproject/types'; +import { BlockParam, CallData, JSONRPCRequestPayload, TransactionTrace, TxData } from 'ethereum-types'; import * as fs from 'fs'; import * as _ from 'lodash'; import { Lock } from 'semaphore-async-await'; diff --git a/packages/sol-cov/src/trace.ts b/packages/sol-cov/src/trace.ts index 6caea1610..0b725ead5 100644 --- a/packages/sol-cov/src/trace.ts +++ b/packages/sol-cov/src/trace.ts @@ -1,4 +1,4 @@ -import { OpCode, StructLog, TransactionTrace } from '@0xproject/types'; +import { OpCode, StructLog, TransactionTrace } from 'ethereum-types'; import { addressUtils, BigNumber, logUtils } from '@0xproject/utils'; import { addHexPrefix, stripHexPrefix } from 'ethereumjs-util'; import * as fs from 'fs'; diff --git a/packages/sol-cov/test/trace_test.ts b/packages/sol-cov/test/trace_test.ts index c140cba0d..b3a15e151 100644 --- a/packages/sol-cov/test/trace_test.ts +++ b/packages/sol-cov/test/trace_test.ts @@ -1,4 +1,4 @@ -import { OpCode, StructLog } from '@0xproject/types'; +import { OpCode, StructLog } from 'ethereum-types'; import * as chai from 'chai'; import * as fs from 'fs'; import * as _ from 'lodash'; -- cgit v1.2.3 From fa3d011f68630e36b1a3812dd493a5144ebc6c53 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 31 May 2018 10:14:23 -0700 Subject: Add ethereum-types to extraFileIncludes --- packages/sol-cov/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages/sol-cov') diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index 8f272a00c..4d92a610b 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -29,7 +29,8 @@ "docPublishConfigs": { "extraFileIncludes": [ "../subproviders/src/types.ts", - "../types/src/index.ts" + "../types/src/index.ts", + "../ethereum-types/src/index.ts" ], "s3BucketPath": "s3://doc-jsons/sol-cov/", "s3StagingBucketPath": "s3://staging-doc-jsons/sol-cov/" -- cgit v1.2.3 From a2fc9a964ba6dd5379924e786df430c4fce3fc7a Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 31 May 2018 11:18:38 -0700 Subject: Fix linter errors --- packages/sol-cov/src/trace.ts | 2 +- packages/sol-cov/test/trace_test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/sol-cov') diff --git a/packages/sol-cov/src/trace.ts b/packages/sol-cov/src/trace.ts index 0b725ead5..1c21c8e5c 100644 --- a/packages/sol-cov/src/trace.ts +++ b/packages/sol-cov/src/trace.ts @@ -1,5 +1,5 @@ -import { OpCode, StructLog, TransactionTrace } from 'ethereum-types'; import { addressUtils, BigNumber, logUtils } from '@0xproject/utils'; +import { OpCode, StructLog, TransactionTrace } from 'ethereum-types'; import { addHexPrefix, stripHexPrefix } from 'ethereumjs-util'; import * as fs from 'fs'; import * as _ from 'lodash'; diff --git a/packages/sol-cov/test/trace_test.ts b/packages/sol-cov/test/trace_test.ts index b3a15e151..07e270b71 100644 --- a/packages/sol-cov/test/trace_test.ts +++ b/packages/sol-cov/test/trace_test.ts @@ -1,5 +1,5 @@ -import { OpCode, StructLog } from 'ethereum-types'; import * as chai from 'chai'; +import { OpCode, StructLog } from 'ethereum-types'; import * as fs from 'fs'; import * as _ from 'lodash'; import 'mocha'; -- cgit v1.2.3