Skip to content

Commit

Permalink
added solium linter for solidity
Browse files Browse the repository at this point in the history
  • Loading branch information
jellegerbrandy committed Jul 24, 2017
1 parent e88604a commit 13c165f
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 26 deletions.
2 changes: 2 additions & 0 deletions .soliumignore
@@ -0,0 +1,2 @@
node_modules
docs
22 changes: 22 additions & 0 deletions .soliumrc.json
@@ -0,0 +1,22 @@
{
"custom-rules-filename": null,
"rules": {
"imports-on-top": true,
"variable-declarations": true,
"array-declarations": true,
"operator-whitespace": true,
"lbrace": true,
"mixedcase": true,
"camelcase": true,
"uppercase": true,
"no-with": true,
"no-empty-blocks": true,
"no-unused-vars": true,
"double-quotes": true,
"blank-lines": true,
"indentation": true,
"whitespace": true,
"deprecated-suicide": true,
"pragma-on-top": true
}
}
48 changes: 24 additions & 24 deletions contracts/universalSchemes/UpgradeScheme.sol
Expand Up @@ -150,31 +150,31 @@ contract UpgradeScheme is UniversalScheme, ExecutableInterface {
* @param _param a parameter of the voting result, 0 is no and 1 is yes.
*/
function execute(bytes32 _proposalId, address _avatar, int _param) returns(bool) {
// Check the caller is indeed the voting machine:
require(parameters[getParametersFromController(Avatar(_avatar))].boolVote == msg.sender);
// Check if vote was successful:
if (_param != 1 ) {
// Check the caller is indeed the voting machine:
require(parameters[getParametersFromController(Avatar(_avatar))].boolVote == msg.sender);
// Check if vote was successful:
if (_param != 1 ) {
delete organizations[_avatar].proposals[_proposalId];
return true;
}
// Define controller and get the parmas:
Controller controller = Controller(Avatar(_avatar).owner());
UpgradeProposal proposal = organizations[_avatar].proposals[_proposalId];

// Upgrading controller:
if (proposal.proposalType == 1) {
if( ! controller.upgradeController(proposal.newContOrScheme) ) revert();
}

// Changing upgrade scheme:
if (proposal.proposalType == 2) {
bytes4 permissions = controller.getSchemePermissions(this);
if (proposal.fee != 0 )
if (!controller.externalTokenApprove(proposal.tokenFee, proposal.newContOrScheme, proposal.fee)) revert();
if( ! controller.registerScheme(proposal.newContOrScheme, proposal.params, permissions) ) revert();
if( ! controller.unregisterSelf() ) revert();
}
delete organizations[_avatar].proposals[_proposalId];
return true;
}
// Define controller and get the parmas:
Controller controller = Controller(Avatar(_avatar).owner());
UpgradeProposal proposal = organizations[_avatar].proposals[_proposalId];

// Upgrading controller:
if (proposal.proposalType == 1) {
if( ! controller.upgradeController(proposal.newContOrScheme) ) revert();
}

// Changing upgrade scheme:
if (proposal.proposalType == 2) {
bytes4 permissions = controller.getSchemePermissions(this);
if (proposal.fee != 0 )
if (!controller.externalTokenApprove(proposal.tokenFee, proposal.newContOrScheme, proposal.fee)) revert();
if( ! controller.registerScheme(proposal.newContOrScheme, proposal.params, permissions) ) revert();
if( ! controller.unregisterSelf() ) revert();
}
delete organizations[_avatar].proposals[_proposalId];
return true;
}
}
7 changes: 5 additions & 2 deletions package.json
Expand Up @@ -10,7 +10,8 @@
"test": "truffle test",
"testrpc": "pm2 start testrpc",
"start": "pm2 start truffle -- serve",
"lint": "eslint ."
"lint": "eslint .",
"solium": "solium --dir ."
},
"devDependencies": {
"babel-eslint": "^7.2.3",
Expand Down Expand Up @@ -47,5 +48,7 @@
"url": "https://github.com/daostack/daostack/issues"
},
"homepage": "https://github.com/daostack/daostack",
"dependencies": {}
"dependencies": {
"solium": "^0.5.4"
}
}

0 comments on commit 13c165f

Please sign in to comment.