Skip to content

Commit

Permalink
Merge pull request #2107 from ethereum/yann300-patch-5
Browse files Browse the repository at this point in the history
bump version and remove linking remix to specific commit hash
  • Loading branch information
yann300 committed Jun 24, 2019
2 parents 1a09573 + 27a54e4 commit a4e5feb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@
"npm-link-local": "^1.1.0",
"npm-run-all": "^4.0.2",
"onchange": "^3.2.1",
"remix-analyzer": "0.3.7",
"remix-debug": "0.3.8",
"remix-lib": "0.4.6",
"remix-solidity": "0.3.7",
"remix-analyzer": "0.3.8",
"remix-debug": "0.3.9",
"remix-lib": "0.4.7",
"remix-solidity": "0.3.8",
"remix-tabs": "1.0.46",
"remix-tests": "0.1.9",
"remix-tests": "0.1.11",
"remixd": "0.1.8-alpha.6",
"request": "^2.83.0",
"rimraf": "^2.6.1",
Expand Down Expand Up @@ -174,7 +174,6 @@
"test": "csslint && standard && node test/index.js",
"test-browser": "npm-run-all -lpr selenium downloadsolc_root make-mock-compiler serve browsertest",
"watch": "watchify src/index.js -dv -p browserify-reload -o build/app.js --exclude solc",
"reinstall": "rm ./node-modules/ -rf; rm package-lock.json; rm ./build/ -rf; npm install; npm run build",
"postinstall": "cd .. && if [ ! -d \"remix\" ] ; then git clone https://github.com/ethereum/remix; fi && cd remix && git checkout 517db1adce48feac758aff7465241c0dd385b906 && npm install && npm run bootstrap && cd .. && cd remix-ide && npm run setupremix"
"reinstall": "rm ./node-modules/ -rf; rm package-lock.json; rm ./build/ -rf; npm install; npm run build"
}
}
1 change: 1 addition & 0 deletions test-browser/tests/generalTests.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ module.exports = {
browser.getAttribute('.instance:nth-of-type(4)', 'id', (result) => {
// skip 'instance' part of e.g. 'instance0x692a70d2e424a56d2c6c27aa97d1a86395877b3a'
const address = result.value.slice('instance'.length)
console.log('Test Signature', result)
browser.clickFunction('ecrecovery - call', {types: 'bytes32 hash, bytes sig', values: `"${hash.value}","${signature.value}"`})
.verifyCallReturnValue(
address,
Expand Down

0 comments on commit a4e5feb

Please sign in to comment.