mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Add more typings

Browse Source
pull/7/head
Omkara 6 years ago
parent fa5af91759
commit 3478079dcd
8 changed files with 43 additions and 44 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 23
      remix-tests/src/compiler.ts
  2. 15
      remix-tests/src/deployer.ts
  3. 6
      remix-tests/src/index.ts
  4. 8
      remix-tests/src/run.ts
  5. 6
      remix-tests/src/runTestFiles.ts
  6. 13
      remix-tests/src/runTestSources.ts
  7. 2
      remix-tests/src/testRunner.ts
  8. 14
      remix-tests/tests/testRunner.ts

23
remix-tests/src/compiler.ts
Unescape View File

@ -1,10 +1,9 @@
/* eslint no-extend-native: "warn" */
let fs = require('./fileSystem')
import fs from './fileSystem'
var async = require('async')
var path = require('path')
let RemixCompiler = require('remix-solidity').Compiler
function regexIndexOf (inputString, regex, startpos = 0) {
var indexOf = inputString.substring(startpos).search(regex)
return (indexOf >= 0) ? (indexOf + (startpos)) : indexOf
@ -26,8 +25,8 @@ var userAgent = (typeof (navigator) !== 'undefined') && navigator.userAgent ? na
var isBrowser = !(typeof (window) === 'undefined' || userAgent.indexOf(' electron/') > -1)
// TODO: replace this with remix's own compiler code
export function compileFileOrFiles (filename, isDirectory, opts, cb) {
let compiler
export function compileFileOrFiles(filename: string, isDirectory: boolean, opts: any, cb: Function) {
let compiler: any
let accounts = opts.accounts || []
const sources = {
'tests.sol': { content: require('../sol/tests.sol.js') },
@ -43,7 +42,7 @@ export function compileFileOrFiles (filename, isDirectory, opts, cb) {
// We should only walk through directory if a directory name is passed
try {
// walkSync only if it is a directory
fs.walkSync(filepath, foundpath => {
fs.walkSync(filepath, (foundpath: string) => {
// only process .sol files
if (foundpath.split('.').pop() === 'sol') {
let c = fs.readFileSync(foundpath).toString()
@ -59,21 +58,21 @@ export function compileFileOrFiles (filename, isDirectory, opts, cb) {
throw e
} finally {
async.waterfall([
function loadCompiler (next) {
function loadCompiler(next: Function) {
compiler = new RemixCompiler()
compiler.onInternalCompilerLoaded()
// compiler.event.register('compilerLoaded', this, function (version) {
next()
// });
},
function doCompilation (next) {
function doCompilation(next: Function) {
// @ts-ignore
compiler.event.register('compilationFinished', this, function (success, data, source) {
next(null, data)
})
compiler.compile(sources, filepath)
}
], function (err, result) {
], function (err: Error | null | undefined, result) {
let errors = (result.errors || []).filter((e) => e.type === 'Error' || e.severity === 'error')
if (errors.length > 0) {
if (!isBrowser) require('signale').fatal(errors)
@ -84,7 +83,7 @@ export function compileFileOrFiles (filename, isDirectory, opts, cb) {
}
}
export function compileContractSources (sources, importFileCb, opts, cb) {
export function compileContractSources(sources, importFileCb, opts, cb) {
let compiler, filepath
let accounts = opts.accounts || []
// Iterate over sources keys. Inject test libraries. Inject test library import statements.
@ -102,21 +101,21 @@ export function compileContractSources (sources, importFileCb, opts, cb) {
}
async.waterfall([
function loadCompiler (next) {
function loadCompiler (next: Function) {
compiler = new RemixCompiler(importFileCb)
compiler.onInternalCompilerLoaded()
// compiler.event.register('compilerLoaded', this, function (version) {
next()
// });
},
function doCompilation (next) {
function doCompilation (next: Function) {
// @ts-ignore
compiler.event.register('compilationFinished', this, function (success, data, source) {
next(null, data)
})
compiler.compile(sources, filepath)
}
], function (err, result) {
], function (err: Error | null | undefined , result) {
let errors = (result.errors || []).filter((e) => e.type === 'Error' || e.severity === 'error')
if (errors.length > 0) {
if (!isBrowser) require('signale').fatal(errors)

15
remix-tests/src/deployer.ts
Unescape View File

@ -1,19 +1,20 @@
var async = require('async')
var remixLib = require('remix-lib')
import Web3 from 'web3'
export function deployAll (compileResult, web3, callback) {
export function deployAll(compileResult: object, web3: Web3, callback: Function) {
let compiledObject = {}
let contracts = {}
let accounts = []
let accounts: string[] = []
async.waterfall([
function getAccountList (next) {
function getAccountList(next: Function) {
web3.eth.getAccounts((_err, _accounts) => {
accounts = _accounts
next()
})
},
function getContractData (next) {
function getContractData(next: Function) {
for (let contractFile in compileResult) {
for (let contractName in compileResult[contractFile]) {
let contract = compileResult[contractFile][contractName]
@ -38,8 +39,8 @@ export function deployAll (compileResult, web3, callback) {
}
next()
},
function determineContractsToDeploy (next) {
let contractsToDeploy = ['Assert']
function determineContractsToDeploy(next: Function) {
let contractsToDeploy: string[] = ['Assert']
let allContracts = Object.keys(compiledObject)
for (let contractName of allContracts) {
@ -52,7 +53,7 @@ export function deployAll (compileResult, web3, callback) {
}
next(null, contractsToDeploy)
},
function deployContracts (contractsToDeploy, next) {
function deployContracts(contractsToDeploy: string[], next: Function) {
var deployRunner = (deployObject, contractObject, contractName, filename, callback) => {
deployObject.estimateGas().then((gasValue) => {
deployObject.send({

6
remix-tests/src/index.ts
Unescape View File

@ -1,6 +1,6 @@
import runTestFiles from './runTestFiles'
import runTestSources from './runTestSources'
import runTest from './testRunner'
import { runTestFiles } from './runTestFiles'
import { runTestSources } from './runTestSources'
import { runTest } from './testRunner'
module.exports = {
runTestFiles: runTestFiles,

8
remix-tests/src/run.ts
Unescape View File

@ -1,7 +1,9 @@
#!/usr/bin/env ts-node
const commander = require('commander')
const Web3 = require('web3')
import runTestFiles from './runTestFiles'
import fs = require('./fileSystem')
import Web3 from 'web3'
import { runTestFiles } from './runTestFiles'
import fs from './fileSystem'
const Provider = require('remix-simulator').Provider
import Log = require('./logger')
const logger = new Log()

6
remix-tests/src/runTestFiles.ts
Unescape View File

@ -1,13 +1,13 @@
import async = require('async')
import path = require('path')
import fs from './fileSystem'
import runTest from './testRunner'
import { runTest } from './testRunner'
require('colors')
import Compiler = require('./compiler')
import Deployer = require('./deployer')
function runTestFiles(filepath, isDirectory, web3, opts = {}) {
export function runTestFiles(filepath, isDirectory, web3, opts = {}) {
opts = opts || {}
const { Signale } = require('signale')
// signale configuration
@ -129,5 +129,3 @@ function runTestFiles(filepath, isDirectory, web3, opts = {}) {
], function () {
})
}
export = runTestFiles;

13
remix-tests/src/runTestSources.ts
Unescape View File

@ -1,9 +1,9 @@
import async from 'async'
require('colors')
import Compiler = require('./compiler.js')
import Deployer = require('./deployer.js')
import runTest from './testRunner'
import { compileContractSources } from './compiler'
import { deployAll } from './deployer'
import { runTest } from './testRunner'
import Web3 = require('web3')
import Provider from 'remix-simulator'
@ -21,7 +21,7 @@ var createWeb3Provider = function () {
return web3
}
function runTestSources(contractSources, testCallback, resultCallback, finalCallback, importFileCb, opts) {
export function runTestSources(contractSources, testCallback, resultCallback, finalCallback, importFileCb, opts) {
opts = opts || {}
let web3 = opts.web3 || createWeb3Provider()
let accounts = opts.accounts || null
@ -34,10 +34,10 @@ function runTestSources(contractSources, testCallback, resultCallback, finalCall
})
},
function compile (next) {
Compiler.compileContractSources(contractSources, importFileCb, opts, next)
compileContractSources(contractSources, importFileCb, opts, next)
},
function deployAllContracts (compilationResult, next) {
Deployer.deployAll(compilationResult, web3, function (err, contracts) {
deployAll(compilationResult, web3, function (err, contracts) {
if (err) {
next(err)
}
@ -115,4 +115,3 @@ function runTestSources(contractSources, testCallback, resultCallback, finalCall
}
], finalCallback)
}
export = runTestSources;

2
remix-tests/src/testRunner.ts
Unescape View File

@ -73,7 +73,7 @@ function createRunList (jsonInterface) {
return runList
}
export default function runTest (testName, testObject: any, contractDetails: any, opts: any, testCallback: TestCbInterface, resultsCallback: ResultCbInterface) {
export function runTest(testName, testObject: any, contractDetails: any, opts: any, testCallback: TestCbInterface, resultsCallback: ResultCbInterface) {
let runList = createRunList(testObject._jsonInterface)
let passingNum: number = 0

14
remix-tests/tests/testRunner.ts
Unescape View File

@ -3,9 +3,9 @@ import Web3 from 'web3'
import * as assert from 'assert'
import { Provider } from 'remix-simulator'
let Compiler = require('../dist/compiler.js')
let Deployer = require('../dist/deployer.js')
import runTest, { ResultsInterface, TestCbInterface, ResultCbInterface } from '../dist/testRunner.js'
import { compileFileOrFiles } from '../dist/compiler'
import { deployAll } from '../dist/deployer'
import { runTest, ResultsInterface, TestCbInterface, ResultCbInterface } from '../dist/testRunner'
function compileAndDeploy(filename: string, callback: Function) {
let web3: Web3 = new Web3()
@ -19,13 +19,13 @@ function compileAndDeploy(filename: string, callback: Function) {
next(_err)
})
},
function compile(next: Function) {
Compiler.compileFileOrFiles(filename, false, { accounts }, next)
function compile(next: Function): void {
compileFileOrFiles(filename, false, { accounts }, next)
},
function deployAllContracts(compilationResult: object, next: Function): void {
try {
compilationData = compilationResult
Deployer.deployAll(compilationResult, web3, next)
deployAll(compilationResult, web3, next)
} catch (e) {
throw e
}
@ -39,7 +39,7 @@ function compileAndDeploy(filename: string, callback: Function) {
describe('testRunner', () => {
describe('#runTest', () => {
describe('test with beforeAll', () => {
let filename = 'tests/examples_1/simple_storage_test.sol'
let filename: string = 'tests/examples_1/simple_storage_test.sol'
let tests: any[] = [], results: ResultsInterface;
before((done) => {

Write Preview
Loading…
Cancel
Save