update remix-simulator syntax to use const, let and this

remix-simulator/index.js

@@ -1,4 +1,4 @@
-var Provider = require('./src/provider')
+const Provider = require('./src/provider')
 
 module.exports = {
   Provider: Provider

remix-simulator/src/genesis.js

@@ -1,9 +1,9 @@
-var EthJSBlock = require('ethereumjs-block')
-var ethJSUtil = require('ethereumjs-util')
-var BN = ethJSUtil.BN
+const EthJSBlock = require('ethereumjs-block')
+const ethJSUtil = require('ethereumjs-util')
+const BN = ethJSUtil.BN
 
 function generateBlock (executionContext) {
-  var block = new EthJSBlock({
+  const block = new EthJSBlock({
     header: {
       timestamp: (new Date().getTime() / 1000 | 0),
       number: 0,
@@ -15,7 +15,7 @@ function generateBlock (executionContext) {
     uncleHeaders: []
   })
 
-  executionContext.vm().runBlock({ block: block, generate: true, skipBlockValidation: true, skipBalance: false }).then(function () {
+  executionContext.vm().runBlock({ block: block, generate: true, skipBlockValidation: true, skipBalance: false }).then(() => {
     executionContext.addBlock(block)
   })
 }

remix-simulator/src/methods/accounts.js

@@ -1,8 +1,8 @@
-var ethJSUtil = require('ethereumjs-util')
-var BN = ethJSUtil.BN
-var Web3 = require('web3')
+const ethJSUtil = require('ethereumjs-util')
+const BN = ethJSUtil.BN
+const Web3 = require('web3')
 
-var Accounts = function (executionContext) {
+const Accounts = function (executionContext) {
   this.web3 = new Web3()
   this.executionContext = executionContext
   // TODO: make it random and/or use remix-libs
@@ -23,7 +23,7 @@ Accounts.prototype.init = async function () {
         if (err) {
           throw new Error(err)
         }
-        var balance = '0x56BC75E2D63100000'
+        const balance = '0x56BC75E2D63100000'
         account.balance = balance || '0xf00000000000000001'
         resolve()
       })

remix-simulator/src/methods/blocks.js

@@ -1,5 +1,5 @@
 
-var Blocks = function (executionContext, _options) {
+const Blocks = function (executionContext, _options) {
   this.executionContext = executionContext
   const options = _options || {}
   this.coinbase = options.coinbase || '0x0000000000000000000000000000000000000000'

remix-simulator/src/methods/filters.js

@@ -1,5 +1,5 @@
 
-var Filters = function (executionContext) {
+const Filters = function (executionContext) {
   this.executionContext = executionContext
 }
 

remix-simulator/src/methods/misc.js

@@ -1,7 +1,7 @@
-var version = require('../../package.json').version
-var web3 = require('web3')
+const version = require('../../package.json').version
+const web3 = require('web3')
 
-var Misc = function () {
+const Misc = function () {
 }
 
 Misc.prototype.methods = function () {
@@ -41,7 +41,7 @@ Misc.prototype.eth_hashrate = function (payload, cb) {
 }
 
 Misc.prototype.web3_sha3 = function (payload, cb) {
-  let str = payload.params[0]
+  const str = payload.params[0]
   cb(null, web3.utils.sha3(str))
 }
 

remix-simulator/src/methods/net.js

@@ -1,5 +1,5 @@
 
-var Net = function () {
+const Net = function () {
 }
 
 Net.prototype.methods = function () {

remix-simulator/src/methods/transactions.js

@@ -1,9 +1,9 @@
-var Web3 = require('web3')
-var ethJSUtil = require('ethereumjs-util')
-var processTx = require('./txProcess.js')
-var BN = ethJSUtil.BN
+const Web3 = require('web3')
+const ethJSUtil = require('ethereumjs-util')
+const processTx = require('./txProcess.js')
+const BN = ethJSUtil.BN
 
-var Transactions = function (executionContext) {
+const Transactions = function (executionContext) {
   this.executionContext = executionContext
 }
 
@@ -39,9 +39,9 @@ Transactions.prototype.eth_getTransactionReceipt = function (payload, cb) {
       return cb(error)
     }
 
-    var txBlock = this.executionContext.txs[receipt.hash]
+    const txBlock = this.executionContext.txs[receipt.hash]
 
-    var r = {
+    const r = {
       'transactionHash': receipt.hash,
       'transactionIndex': '0x00',
       'blockHash': '0x' + txBlock.hash().toString('hex'),
@@ -111,10 +111,10 @@ Transactions.prototype.eth_getTransactionByHash = function (payload, cb) {
       return cb(error)
     }
 
-    var txBlock = this.executionContext.txs[receipt.transactionHash]
+    const txBlock = this.executionContext.txs[receipt.transactionHash]
 
     // TODO: params to add later
-    let r = {
+    const r = {
       'blockHash': '0x' + txBlock.hash().toString('hex'),
       'blockNumber': '0x' + txBlock.header.number.toString('hex'),
       'from': receipt.from,
@@ -151,7 +151,7 @@ Transactions.prototype.eth_getTransactionByHash = function (payload, cb) {
 Transactions.prototype.eth_getTransactionByBlockHashAndIndex = function (payload, cb) {
   const txIndex = payload.params[1]
 
-  var txBlock = this.executionContext.blocks[payload.params[0]]
+  const txBlock = this.executionContext.blocks[payload.params[0]]
   const txHash = '0x' + txBlock.transactions[Web3.utils.toDecimal(txIndex)].hash().toString('hex')
 
   this.executionContext.web3().eth.getTransactionReceipt(txHash, (error, receipt) => {
@@ -193,7 +193,7 @@ Transactions.prototype.eth_getTransactionByBlockHashAndIndex = function (payload
 Transactions.prototype.eth_getTransactionByBlockNumberAndIndex = function (payload, cb) {
   const txIndex = payload.params[1]
 
-  var txBlock = this.executionContext.blocks[payload.params[0]]
+  const txBlock = this.executionContext.blocks[payload.params[0]]
   const txHash = '0x' + txBlock.transactions[Web3.utils.toDecimal(txIndex)].hash().toString('hex')
 
   this.executionContext.web3().eth.getTransactionReceipt(txHash, (error, receipt) => {
@@ -202,7 +202,7 @@ Transactions.prototype.eth_getTransactionByBlockNumberAndIndex = function (paylo
     }
 
     // TODO: params to add later
-    let r = {
+    const r = {
       'blockHash': '0x' + txBlock.hash().toString('hex'),
       'blockNumber': '0x' + txBlock.header.number.toString('hex'),
       'from': receipt.from,

remix-simulator/src/methods/txProcess.js

@@ -1,9 +1,9 @@
-var RemixLib = require('remix-lib')
-var TxExecution = RemixLib.execution.txExecution
-var TxRunner = RemixLib.execution.txRunner
+const RemixLib = require('remix-lib')
+const TxExecution = RemixLib.execution.txExecution
+const TxRunner = RemixLib.execution.txRunner
 
 function runCall (payload, from, to, data, value, gasLimit, txRunner, callbacks, callback) {
-  let finalCallback = function (err, result) {
+  const finalCallback = function (err, result) {
     if (err) {
       return callback(err)
     }
@@ -16,7 +16,7 @@ function runCall (payload, from, to, data, value, gasLimit, txRunner, callbacks,
 }
 
 function runTx (payload, from, to, data, value, gasLimit, txRunner, callbacks, callback) {
-  let finalCallback = function (err, result) {
+  const finalCallback = function (err, result) {
     if (err) {
       return callback(err)
     }
@@ -27,7 +27,7 @@ function runTx (payload, from, to, data, value, gasLimit, txRunner, callbacks, c
 }
 
 function createContract (payload, from, data, value, gasLimit, txRunner, callbacks, callback) {
-  let finalCallback = function (err, result) {
+  const finalCallback = function (err, result) {
     if (err) {
       return callback(err)
     }
@@ -40,7 +40,7 @@ function createContract (payload, from, data, value, gasLimit, txRunner, callbac
 let txRunnerInstance
 
 function processTx (executionContext, accounts, payload, isCall, callback) {
-  let api = {
+  const api = {
     logMessage: (msg) => {
     },
     logHtmlMessage: (msg) => {

remix-simulator/src/provider.js

@@ -1,5 +1,5 @@
-var RemixLib = require('remix-lib')
-var executionContext = RemixLib.execution.executionContext
+const RemixLib = require('remix-lib')
+const executionContext = RemixLib.execution.executionContext
 
 const log = require('./utils/logs.js')
 const merge = require('merge')
@@ -40,7 +40,7 @@ Provider.prototype.init = async function () {
 Provider.prototype.sendAsync = function (payload, callback) {
   log.info('payload method is ', payload.method)
 
-  let method = this.methods[payload.method]
+  const method = this.methods[payload.method]
   if (this.options.logDetails) {
     log.info(payload)
   }
@@ -53,7 +53,7 @@ Provider.prototype.sendAsync = function (payload, callback) {
       if (err) {
         return callback(err)
       }
-      let response = {'id': payload.id, 'jsonrpc': '2.0', 'result': result}
+      const response = {'id': payload.id, 'jsonrpc': '2.0', 'result': result}
       callback(null, response)
     })
   }

remix-simulator/src/utils/logs.js

@@ -1,8 +1,8 @@
 'use strict'
 
-var gray = require('ansi-gray')
-var timestamp = require('time-stamp')
-var supportsColor = require('color-support')
+const gray = require('ansi-gray')
+const timestamp = require('time-stamp')
+const supportsColor = require('color-support')
 
 function hasFlag (flag) {
   return ((typeof (process) !== 'undefined') && (process.argv.indexOf('--' + flag) !== -1))
@@ -24,7 +24,7 @@ function addColor (str) {
   return str
 }
 
-let logger = {
+const logger = {
   stdout: function (arg) {
     if (typeof (process) === 'undefined' || !process.stdout) return
     process.stdout.write(arg)
@@ -36,40 +36,40 @@ let logger = {
 }
 
 function getTimestamp () {
-  let coloredTimestamp = addColor(timestamp('HH:mm:ss'))
+  const coloredTimestamp = addColor(timestamp('HH:mm:ss'))
   return '[' + coloredTimestamp + ']'
 }
 
 function log () {
-  var time = getTimestamp()
+  const time = getTimestamp()
   logger.stdout(time + ' ')
   console.log.apply(console, arguments)
   return this
 }
 
 function info () {
-  var time = getTimestamp()
+  const time = getTimestamp()
   logger.stdout(time + ' ')
   console.info.apply(console, arguments)
   return this
 }
 
 function dir () {
-  var time = getTimestamp()
+  const time = getTimestamp()
   logger.stdout(time + ' ')
   console.dir.apply(console, arguments)
   return this
 }
 
 function warn () {
-  var time = getTimestamp()
+  const time = getTimestamp()
   logger.stderr(time + ' ')
   console.warn.apply(console, arguments)
   return this
 }
 
 function error () {
-  var time = getTimestamp()
+  const time = getTimestamp()
   logger.stderr(time + ' ')
   console.error.apply(console, arguments)
   return this

remix-simulator/test/accounts.js

@@ -1,28 +1,28 @@
 /* global describe, before, it */
-var Web3 = require('web3')
-var RemixSim = require('../index.js')
-let web3 = new Web3()
-var assert = require('assert')
+const Web3 = require('web3')
+const RemixSim = require('../index.js')
+const web3 = new Web3()
+const assert = require('assert')
 
-describe('Accounts', function () {
+describe('Accounts', () => {
   before(function () {
-    let provider = new RemixSim.Provider()
+    const provider = new RemixSim.Provider()
     web3.setProvider(provider)
   })
 
   describe('eth_getAccounts', () => {
     it('should get a list of accounts', async function () {
-      let accounts = await web3.eth.getAccounts()
+      const accounts = await web3.eth.getAccounts()
       assert.notEqual(accounts.length, 0)
     })
   })
 
   describe('eth_getBalance', () => {
-    it('should get a account balance', async function () {
-      let accounts = await web3.eth.getAccounts()
-      let balance0 = await web3.eth.getBalance(accounts[0])
-      let balance1 = await web3.eth.getBalance(accounts[1])
-      let balance2 = await web3.eth.getBalance(accounts[2])
+    it('should get a account balance', async () => {
+      const accounts = await web3.eth.getAccounts()
+      const balance0 = await web3.eth.getBalance(accounts[0])
+      const balance1 = await web3.eth.getBalance(accounts[1])
+      const balance2 = await web3.eth.getBalance(accounts[2])
 
       assert.deepEqual(balance0, '100000000000000000000')
       assert.deepEqual(balance1, '100000000000000000000')
@@ -31,9 +31,9 @@ describe('Accounts', function () {
   })
 
   describe('eth_sign', () => {
-    it('should sign payloads', async function () {
-      let accounts = await web3.eth.getAccounts()
-      let signature = await web3.eth.sign('Hello world', accounts[0])
+    it('should sign payloads', async () => {
+      const accounts = await web3.eth.getAccounts()
+      const signature = await web3.eth.sign('Hello world', accounts[0])
 
       assert.deepEqual(signature.length, 132)
     })