Skip to content

Commit

Permalink
Merge branch 'master' into fix/wait-for-confirmations
Browse files Browse the repository at this point in the history
  • Loading branch information
kosecki123 committed Sep 19, 2018
2 parents 61bf237 + f744f73 commit e403904
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 16 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ It will produce an `index.js` file which can be imported into any project and us

## Test
```
npm run ganache
npm run deploy-eac
npm run test
```

Expand Down
61 changes: 46 additions & 15 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@types/chai": "4.1.4",
"@types/ethereumjs-tx": "1.0.0",
"@types/lokijs": "1.5.2",
"@types/node": "10.9.4",
"@types/node": "10.10.1",
"bluebird": "3.5.2",
"chai": "4.1.2",
"coveralls": "3.0.2",
Expand Down

0 comments on commit e403904

Please sign in to comment.