-
Notifications
You must be signed in to change notification settings - Fork 264
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Feature, n/a] updated dependencies #151
Closed
Closed
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
864f546
updated dependencies and fixed linting issues
davesag 8344952
updated node version to latest LTS version
davesag 540d9f4
removed reference to solidity-parser-sc as it's been replaced with so…
davesag 2de7242
updated changelog
davesag ae79195
minor change to trigger another build
davesag 58f9e45
alts based on feedback to PR
davesag f767479
restored notes to docs with minor corrections to spelling and formatting
davesag e61b6cc
added --exit to mocha options to try and fix the CircleCI timout issue
davesag eeb8577
improved test coverage stats
davesag c1decf2
ignore coverage folder
davesag f3c079d
fixed linting
davesag b02b10a
remove --fix from lint script as this confuses CircleCI. To auto fix…
davesag c938eb7
added linting to circleCI config
davesag ec4c355
reverted solparse back to solidity-parser-sc
davesag a20cd9a
n/a merged in changes from release 1.4.1
davesag d09a460
n/a merged in changes from 1.4.2
davesag f7157ce
merged in changes from 1.4.9
davesag 880ead1
rebased from master, updated deps, updated circleci config, linted
davesag File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
# Javascript Node CircleCI 2.0 configuration file | ||
# | ||
# Check https://circleci.com/docs/2.0/language-javascript/ for more details | ||
# | ||
version: 2 | ||
|
||
jobs: | ||
build: | ||
docker: | ||
- image: circleci/node:10 | ||
|
||
steps: | ||
- checkout | ||
|
||
- restore_cache: | ||
keys: | ||
- v1-dependencies-{{ checksum "package.json" }} | ||
# fallback to using the latest cache if no exact match is found | ||
- v1-dependencies- | ||
|
||
- run: | ||
name: Install global packages | ||
# command: sudo npm install -g codecov greenkeeper-lockfile@1 | ||
command: sudo npm install -g codecov | ||
|
||
# - run: | ||
# name: Greenkeeper Lockfile | ||
# command: greenkeeper-lockfile-update | ||
|
||
- run: | ||
name: Install dependencies | ||
command: npm install | ||
|
||
- save_cache: | ||
key: v1-dependencies-{{ checksum "package.json" }} | ||
paths: | ||
- node_modules | ||
|
||
- run: | ||
name: Javascript Linter | ||
command: npm run lint | ||
|
||
- run: | ||
name: Unit tests with code coverage | ||
command: npm run test-cov | ||
|
||
# - run: | ||
# name: Push any lockfile changes | ||
# command: greenkeeper-lockfile-upload | ||
|
||
- run: | ||
name: Send reports to codecov.io | ||
command: codecov |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
test/cli/truffle-crash.js | ||
test/cli/truffle-crash.js | ||
coverage |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,14 @@ | ||
# How to upgrade testrpc-sc | ||
|
||
Warning: this is a birds nest. Any ideas for improvement, however small, are welcome. | ||
Warning: this is a bird's nest. Any ideas for improvement, however small, are welcome. | ||
|
||
### testrpc-sc: | ||
+ published on `npm` as `ethereumjs-testrpc-sc` | ||
+ published **from the coverage branch** of [`sc-forks/testrpc-sc`](https://github.com/sc-forks/testrpc-sc/tree/coverage) | ||
+ a webpack bundle of `sc-forks/ganache-core-sc#coverage` and all of its dependencies. | ||
+ changes to `sc-forks/ganache-core` do not propagate until `testrpc-sc` is rebuilt and published | ||
+ publishing `testrpc-sc` does not propagate until `solidity-coverage`s deps are updated. | ||
|
||
* published on `npm` as `ethereumjs-testrpc-sc` | ||
* published **from the coverage branch** of [`sc-forks/testrpc-sc`](https://github.com/sc-forks/testrpc-sc/tree/coverage) | ||
* a webpack bundle of `sc-forks/ganache-core-sc#coverage` and all of its dependencies. | ||
* changes to `sc-forks/ganache-core` do not propagate until `testrpc-sc` is rebuilt and published | ||
* publishing `testrpc-sc` does not propagate until `solidity-coverage`s deps are updated. | ||
|
||
To publish a new version: | ||
|
||
|
@@ -19,19 +20,22 @@ $ npm run build // Check build, just to make sure | |
$ npm version patch // If helpful. If you're tracking the upstream with a ganache-core sync, use theirs. | ||
$ git push | ||
$ npm publish // This also runs build. | ||
|
||
// Go to `solidity-coverage` and pin its `testrpc-sc` dependency to the new version. | ||
``` | ||
|
||
Go to `solidity-coverage` and pin its `testrpc-sc` dependency to the new version. | ||
|
||
### sc-forks/ganache-core-sc: | ||
+ is what testrpc-sc used to be | ||
+ set by default to [its `coverage` branch](https://github.com/sc-forks/ganache-core-sc) | ||
+ depends on `sc-forks/ethereumjs-vm-sc.git` | ||
+ depends on `sc-forks/provider-engine-sc.git#8.1.19` | ||
+ differs from `truffle-suite/ganache-core` by these deps and | ||
|
||
* is what testrpc-sc used to be | ||
* set by default to [its `coverage` branch](https://github.com/sc-forks/ganache-core-sc) | ||
* depends on `sc-forks/ethereumjs-vm-sc.git` | ||
* depends on `sc-forks/provider-engine-sc.git#8.1.19` | ||
* differs from `truffle-suite/ganache-core` by these deps and | ||
[two lines](https://github.com/sc-forks/ganache-core/blob/ae31080cdc581fef416a1c68cbe28ff71b6fb7c9/lib/blockchain_double.js#L36-L37) | ||
in `blockchain_double.js` which set the block and transaction default gas limits. | ||
|
||
To sync `ganache-core-sc` with its upstream parent at `truffle-suite` | ||
|
||
``` | ||
$ git checkout master | ||
$ git remote add upstream https://github.com/trufflesuite/ganache-core.git | ||
|
@@ -44,39 +48,34 @@ $ git push | |
|
||
### How can I modify ethereumjs-vm-sc and test the changes at `solidity-coverage`? | ||
|
||
Since `[email protected]`, ethereumjs-vm-sc is an independent dev dependency, | ||
Since `[email protected]`, `ethereumjs-vm-sc` is an independent dev dependency, | ||
required by the coverage unit tests. The new testrpc has a separate webpacked copy. The simplest | ||
thing to do is open a branch at `solidity-coverage` and develop directly on the `vm` dep. | ||
When you're satisfied that tests pass with your changes, copy your work over to the `ethereumjs-vm-sc` repo itself. | ||
|
||
In `test/util/vm.js` the `results` object passed back by `vm.runTx` at [callMethod](https://github.com/sc-forks/solidity-coverage/blob/master/test/util/vm.js#L120) | ||
also contains things like the runState and the logs: ex: `results.vm.runState.logs`. | ||
In `test/util/vm.js` the `results` object passed back by `vm.runTx` at [callMethod](https://github.com/sc-forks/solidity-coverage/blob/master/test/util/vm.js#L120) also contains things like the runState and the logs: ex: `results.vm.runState.logs`. | ||
|
||
+ To merge / publish the changes: | ||
+ Merge `ethereumjs-vm-sc#my-new-vm` to master. | ||
+ follow the `testrpc-sc` publication steps above. | ||
To merge / publish the changes: | ||
|
||
There's no reason to worry about changing ethereumjs-vm-sc at master. If that affects anyone (unlikely) | ||
they have safe harbour at any solidity-coverage installation @0.1.9 and up. They can update. | ||
* Merge `ethereumjs-vm-sc#my-new-vm` to master. | ||
* follow the `testrpc-sc` publication steps above. | ||
|
||
There's no reason to worry about changing `ethereumjs-vm-sc` at master. If that affects anyone (unlikely) they have safe harbour at any `solidity-coverage` installation @0.1.9 and up. They can update. | ||
|
||
### E2E Testing | ||
|
||
[sc-forks/zeppelin-solidity](https://github.com/sc-forks/zeppelin-solidity) has been configured to | ||
serve as a simple pre-publication E2E test. By default the package pulls solidity-coverage from the repo's master branch. | ||
|
||
You can trigger a [CI build](https://travis-ci.org/sc-forks/zeppelin-solidity) and [Coveralls report](https://coveralls.io/github/sc-forks/zeppelin-solidity) by running: | ||
|
||
``` | ||
$ npm run ci | ||
``` | ||
|
||
### solidity-parser-sc | ||
|
||
We also publish `solidity-parser-sc` because `consensys/solidity-parser` in its .pegjs form has been | ||
left to die in the wild, unloved by all. Publish at the publish branch by running `npm version patch`, `npm publish`. | ||
|
||
|
||
|
||
|
||
|
||
|
||
### solidity-parser-sc | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. See parser upgrade notes below. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. fixed |
||
We also publish `solidity-parser-sc` because `consensys/solidity-parser` in its `.pegjs` form has been left to die in the wild, unloved by all. | ||
|
||
Publish at the publish branch by running `npm version patch`, `npm publish`. | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@area If you have a sec, could you give your opinion about this rule change? It reformats the code pretty extensively.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@cgewecke and @area do you have a slack or IRC or something?
gitter
perhaps?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't mind 😄. No, we don't have any of those tools set up. I suppose something like that might be useful though.