Skip to content

Commit

Permalink
All tests passing with latest daostack-arc
Browse files Browse the repository at this point in the history
- updated node version
- install truffle locally
- testrpc => ganache
- remove contracts from git
- remove images folder
- use our own migration script
- Use truffle-core-migrate-without-compile to avoid recompiling contracts
- use non-nconf config system for now while we sort out whether it can work for us
- no longer migrate from within arc folder
- rename contracts folder for linux
- include ability to run tests in package
- Remove commented code
  • Loading branch information
dkent600 authored and tibetsprague committed Jan 17, 2018
1 parent f68992f commit 4a5e9fd
Show file tree
Hide file tree
Showing 90 changed files with 4,095 additions and 167,580 deletions.
4 changes: 3 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"presets": ["es2015"],
"plugins": ["syntax-async-functions"]
"plugins": ["syntax-async-functions"],
// for VS Code test code debugging
"sourceMaps": "inline"
}
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"no-confusing-arrow": 2,
"no-lonely-if": 2,
"no-continue": 2,
"indent": ["error", 2, { "SwitchCase": 1 }]
"indent": ["error", 2, { "SwitchCase": 1 }],
"quotes": [2, "double", "avoid-escape"]
}
}
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
node_modules/
.node-xmlhttprequest-sync*
.node-xmlhttprequest-content*
*.tgz
.vscode/
testrpcDb/
ganacheDb/
dist/
ganacheDb.zip
migrated_contracts/
13 changes: 7 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ dist: trusty
language: node_js

node_js:
- "7.10.0"
- "9.3.0"

before_install:
- sudo apt-get update -qq
Expand All @@ -14,13 +14,14 @@ before_install:
- sudo apt-get install geth -y -qq

install:
- yarn
- yarn start test.testrpcDb.restoreFromZip
- nohup yarn start test.testrpcDb.run &
- npm install
- npm start migrateContracts.initialize
- nohup npm start test.ganache.run &
- npm start migrateContracts

script:
- yarn start lint
- yarn start test.automated
- npm start lint
- npm start test.automated

notifications:
slack: daostack:fGuaFPsiQiV5mgmzRcSzbYqw
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The default configuration settings for Arc can be found in config/default.json,
"providerUrl": "http://localhost:8545",
"network": "kovan", // Options are 'homestead', 'ropsten', 'rinkeby', 'kovan'
"apiToken": "" // Required for Infura or Etherscan
"gasLimit": 6500000
"gasLimit": [a number like 6015000]
}
```

Expand Down
7 changes: 4 additions & 3 deletions config/default.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"providerUrl": "http://localhost:8545",
"network": "kovan",
"gasLimit": 6500000
}
"network": "ganache",
"gasLimit": 6015000,
"apiToken": ""
}
Loading

0 comments on commit 4a5e9fd

Please sign in to comment.