Skip to content

Commit

Permalink
Merge pull request #581 from Shrugs/feat/minor-additions
Browse files Browse the repository at this point in the history
Minor standards and cleanup additions.
  • Loading branch information
frangio authored Dec 1, 2017
2 parents cc5e898 + ac38088 commit dd1fd00
Show file tree
Hide file tree
Showing 89 changed files with 2,152 additions and 1,144 deletions.
5 changes: 5 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# configure your infura api key (not technically required)
INFURA_API_KEY=

# change the mnemonic that your hd wallet is seeded with
MNEMONIC=
51 changes: 51 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"extends" : [
"standard",
"plugin:promise/recommended"
],
"plugins": [
"promise"
],
"env": {
"browser" : true,
"node" : true,
"mocha" : true,
"jest" : true
},
"globals" : {
"artifacts": false,
"contract": false,
"assert": false,
"web3": false
},
"rules": {

// Strict mode
"strict": [2, "global"],

// Code style
"indent": [2, 2],
"quotes": [2, "single"],
"semi": ["error", "always"],
"space-before-function-paren": ["error", "always"],
"no-use-before-define": 0,
"eqeqeq": [2, "smart"],
"dot-notation": [2, {"allowKeywords": true, "allowPattern": ""}],
"no-redeclare": [2, {"builtinGlobals": true}],
"no-trailing-spaces": [2, { "skipBlankLines": true }],
"eol-last": 1,
"comma-spacing": [2, {"before": false, "after": true}],
"camelcase": [2, {"properties": "always"}],
"no-mixed-spaces-and-tabs": [2, "smart-tabs"],
"comma-dangle": [1, "always-multiline"],
"no-dupe-args": 2,
"no-dupe-keys": 2,
"no-debugger": 0,
"no-undef": 2,
"object-curly-spacing": [2, "always"],
"max-len": [2, 120, 2],
"generator-star-spacing": ["error", "before"],
"promise/avoid-new": 0,
"promise/always-return": 0
}
}
36 changes: 31 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,35 @@
*.swp
*.swo
node_modules/
build/
.DS_Store/
/coverage
coverage.json

# Logs
logs
*.log

# Runtime data
pids
*.pid
*.seed
allFiredEvents
scTopics

# Coverage directory used by tools like istanbul
coverage
coverage.json

# node-waf configuration
.lock-wscript

# Dependency directory
node_modules

# Debug log from npm
npm-debug.log

# local env variables
.env

# truffle build directory
build/

# lol macs
.DS_Store/
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ cache:
before_script:
- truffle version
script:
- npm test
- npm run lint
- npm run test
notifications:
slack:
rooms:
Expand Down
4 changes: 2 additions & 2 deletions migrations/1_initial_migration.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var Migrations = artifacts.require("./Migrations.sol");
var Migrations = artifacts.require('./Migrations.sol');

module.exports = function(deployer) {
module.exports = function (deployer) {
deployer.deploy(Migrations);
};
10 changes: 7 additions & 3 deletions migrations/2_deploy_contracts.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
//var Ownable = artifacts.require("ownership/Ownable.sol");
// var Ownable = artifacts.require("ownership/Ownable.sol");

module.exports = function(deployer) {
//deployer.deploy(Ownable);
// NOTE: Use this file to easily deploy the contracts you're writing.
// (but make sure to reset this file before committing
// with `git checkout HEAD -- migrations/2_deploy_contracts.js`)

module.exports = function (deployer) {
// deployer.deploy(Ownable);
};
Loading

0 comments on commit dd1fd00

Please sign in to comment.