Skip to content

Commit

Permalink
Add logic for eth.js to deploy Plasma Chains
Browse files Browse the repository at this point in the history
Changes:
- Use Web3.utils instead of importing eth.js in multiple files
- Add timeout before tests start -- this is because now startup takes
too long
- Add some config options
- Suppress node warning coming from a web3 bug. See:
web3/web3.js#1648
  • Loading branch information
karlfloersch committed Jan 15, 2019
1 parent 9df9fba commit 93dcda6
Show file tree
Hide file tree
Showing 16 changed files with 520 additions and 62 deletions.
5 changes: 4 additions & 1 deletion config-test.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"dbDir": "./db-test/",
"plasmaNetworkAddress": "0x0000000000000000000000000000000000000000"
"plasmaRegistryAddress": "0x0000000000000000000000000000000000000000",
"operatorAddress": "0x0000000000000000000000000000000000000000",
"operatorIpAddress": "0.0.0.0",
"web3Provider": ""
}
5 changes: 4 additions & 1 deletion config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"dbDir": "./db/",
"plasmaNetworkAddress": "0x0000000000000000000000000000000000000000"
"plasmaRegistryAddress": "0x0000000000000000000000000000000000000000",
"operatorAddress": "0x0000000000000000000000000000000000000000",
"operatorIpAddress": "0.0.0.0",
"web3Provider": ""
}
344 changes: 344 additions & 0 deletions package-lock.json

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

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"start": "node src/app.js",
"clean": "rm -rf db",
"interactive": "node",
"test": "mocha --timeout 15000 --recursive",
"test-debug": "mocha debug --timeout 15000 --recursive"
"test": "env CONFIG='./config-test.json' NODE_ENV='test' mocha --timeout 15000 --recursive",
"test-debug": "env CONFIG='./config-test.json' NODE_ENV='test' mocha debug --timeout 15000 --recursive"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -44,6 +44,7 @@
"leveldown": "^4.0.1",
"levelup": "^3.1.1",
"lodash": "^4.17.11",
"plasma-contracts": "git+ssh://[email protected]/karlfloersch/plasma-contracts.git",
"plasma-utils": "git+ssh://[email protected]/plasma-group/plasma-utils.git",
"web3": "^1.0.0-beta.37"
}
Expand Down
Loading

0 comments on commit 93dcda6

Please sign in to comment.