Merge pull request #691 from ethereum/fixtapetest

Do not poll in this version of execution context
pull/3094/head
yann300 7 years ago committed by GitHub
commit afe7c03d7e
  1. 2
      remix-lib/package.json
  2. 24
      remix-lib/src/execution/execution-context.js

@ -1,6 +1,6 @@
{
"name": "remix-lib",
"version": "0.1.3",
"version": "0.1.4",
"description": "Ethereum IDE and tools for the web",
"contributors": [
{

@ -186,18 +186,18 @@ function ExecutionContext () {
this.blockGasLimitDefault = 4300000
this.blockGasLimit = this.blockGasLimitDefault
setInterval(() => {
if (this.getProvider() !== 'vm') {
web3.eth.getBlock('latest', (err, block) => {
if (!err) {
// we can't use the blockGasLimit cause the next blocks could have a lower limit : https://github.com/ethereum/remix/issues/506
this.blockGasLimit = (block && block.gasLimit) ? Math.floor(block.gasLimit - (5 * block.gasLimit) / 1024) : this.blockGasLimitDefault
} else {
this.blockGasLimit = this.blockGasLimitDefault
}
})
}
}, 15000)
// removing the setinterval cause it cause tape test to hang and we don't need this.
// there's a copy of this file in remix-ide repo @TODO to refactor
if (this.getProvider() !== 'vm') {
web3.eth.getBlock('latest', (err, block) => {
if (!err) {
// we can't use the blockGasLimit cause the next blocks could have a lower limit : https://github.com/ethereum/remix/issues/506
this.blockGasLimit = (block && block.gasLimit) ? Math.floor(block.gasLimit - (5 * block.gasLimit) / 1024) : this.blockGasLimitDefault
} else {
this.blockGasLimit = this.blockGasLimitDefault
}
})
}
// TODO: not used here anymore and needs to be moved
function setProviderFromEndpoint (endpoint, context, cb) {

Loading…
Cancel
Save