Merge pull request #603 from ethereum/optF

optimisation runs recover default
revert-603-optF
yann300 4 years ago committed by GitHub
commit a25a6759fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 25
      apps/remix-ide-e2e/src/tests/compiler_api.test.ts
  2. 2
      apps/remix-ide/src/app/tabs/compileTab/compilerContainer.js

@ -34,6 +34,14 @@ module.exports = {
.journalChildIncludes(`\\"optimizer\\":{\\"enabled\\":true,\\"runs\\":300}`) .journalChildIncludes(`\\"optimizer\\":{\\"enabled\\":true,\\"runs\\":300}`)
}, },
'Should compile using "compileWithParamaters" API with optimization off check default runs': function (browser: NightwatchBrowser) {
browser
.addFile('test_jsCompileWithOptimizationDefault.js', { content: jsCompileWithOptimizationDefault })
.executeScript('remix.exeCurrent()')
.pause(10000)
.journalChildIncludes(`\\"optimizer\\":{\\"enabled\\":false,\\"runs\\":200}`)
},
'Should update the compiler configuration with "setCompilerConfig" API': function (browser: NightwatchBrowser) { 'Should update the compiler configuration with "setCompilerConfig" API': function (browser: NightwatchBrowser) {
browser browser
.addFile('test_updateConfiguration.js', { content: updateConfiguration }) .addFile('test_updateConfiguration.js', { content: updateConfiguration })
@ -111,11 +119,28 @@ const jsCompileWithOptimization = `(async () => {
} }
const result = await remix.call('solidity', 'compileWithParameters', contract, params) const result = await remix.call('solidity', 'compileWithParameters', contract, params)
console.log('result ', result) console.log('result ', result)
} catch (e) {
console.log(e.message)
}
})()`
const jsCompileWithOptimizationDefault = `(async () => {
try {
const contract = {
"storage.sol": {content : \`${simpleContract}\` }
}
console.log('compile')
const params = {
optimize: false,
}
const result = await remix.call('solidity', 'compileWithParameters', contract, params)
console.log('result ', result)
} catch (e) { } catch (e) {
console.log(e.message) console.log(e.message)
} }
})()` })()`
const updateConfiguration = `(async () => { const updateConfiguration = `(async () => {
try { try {
const params = { const params = {

@ -345,7 +345,9 @@ class CompilerContainer {
this.compileTabLogic.setOptimize(!!this._view.optimize.checked) this.compileTabLogic.setOptimize(!!this._view.optimize.checked)
if (this.compileTabLogic.optimize) { if (this.compileTabLogic.optimize) {
this._view.runs.removeAttribute('disabled') this._view.runs.removeAttribute('disabled')
this.compileTabLogic.setRuns(parseInt(this._view.runs.value))
} else { } else {
this.compileTabLogic.setRuns(200)
this._view.runs.setAttribute('disabled', '') this._view.runs.setAttribute('disabled', '')
} }
this.compileIfAutoCompileOn() this.compileIfAutoCompileOn()

Loading…
Cancel
Save