Merge pull request #1215 from ethereum/remix_tests_import_fix_webpack_vscode

WIP: Import fix for vscode integration
pull/5370/head
yann300 6 years ago committed by GitHub
commit 531a08760d
  1. 2
      remix-tests/src/deployer.ts
  2. 2
      remix-tests/src/run.ts
  3. 2
      remix-tests/src/runTestFiles.ts
  4. 2
      remix-tests/src/testRunner.ts
  5. 2
      remix-tests/tests/testRunner.ts

@ -1,6 +1,6 @@
import async from 'async' import async from 'async'
var remixLib = require('remix-lib') var remixLib = require('remix-lib')
import Web3 from 'web3' import Web3 = require('web3')
export function deployAll(compileResult: object, web3: Web3, callback) { export function deployAll(compileResult: object, web3: Web3, callback) {
let compiledObject = {} let compiledObject = {}

@ -1,5 +1,5 @@
import commander from 'commander' import commander from 'commander'
import Web3 from 'web3' import Web3 = require('web3')
import { runTestFiles } from './runTestFiles' import { runTestFiles } from './runTestFiles'
import fs from './fileSystem' import fs from './fileSystem'
import { Provider } from 'remix-simulator' import { Provider } from 'remix-simulator'

@ -3,7 +3,7 @@ import fs from './fileSystem'
import { runTest } from './testRunner' import { runTest } from './testRunner'
import { TestResultInterface, ResultsInterface } from './types' import { TestResultInterface, ResultsInterface } from './types'
import colors from 'colors' import colors from 'colors'
import Web3 from 'web3' import Web3 = require('web3')
import { compileFileOrFiles } from './compiler' import { compileFileOrFiles } from './compiler'
import { deployAll } from './deployer' import { deployAll } from './deployer'

@ -1,6 +1,6 @@
import async from 'async' import async from 'async'
import * as changeCase from 'change-case' import * as changeCase from 'change-case'
import Web3 from 'web3' import Web3 = require('web3')
import { RunListInterface, TestCbInterface, TestResultInterface, ResultCbInterface } from './types' import { RunListInterface, TestCbInterface, TestResultInterface, ResultCbInterface } from './types'
function getFunctionFullName (signature: string, methodIdentifiers) { function getFunctionFullName (signature: string, methodIdentifiers) {

@ -1,6 +1,6 @@
import 'mocha' import 'mocha'
import * as async from 'async' import * as async from 'async'
import Web3 from 'web3' import Web3 = require('web3')
import * as assert from 'assert' import * as assert from 'assert'
import { Provider } from 'remix-simulator' import { Provider } from 'remix-simulator'

Loading…
Cancel
Save