solium version 1.1.8 (#492)

ganache-cli 6.1.6
daostack · Jul 12, 2018 · 41c93db · 41c93db
1 parent 9b8be62
commit 41c93db
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 2,117 deletions.
diff --git a/.soliumrc.json b/.soliumrc.json
@@ -15,6 +15,9 @@
     "arg-overflow": [
       "warning",
       5
+    ],
+    "error-reason": [
+      "off"
     ]
   }
 }
diff --git a/contracts/controller/Controller.sol b/contracts/controller/Controller.sol
@@ -238,7 +238,7 @@ contract Controller is ControllerInterface {
      * @dev unregister the caller's scheme
      * @return bool which represents a success
      */
-    function unregisterSelf(address _avatar) isAvatarValid(_avatar) external returns(bool) {
+    function unregisterSelf(address _avatar) external isAvatarValid(_avatar) returns(bool) {
         if (_isSchemeRegistered(msg.sender,_avatar) == false) {
             return false;
         }
@@ -247,15 +247,15 @@ contract Controller is ControllerInterface {
         return true;
     }
 
-    function isSchemeRegistered(address _scheme,address _avatar) isAvatarValid(_avatar) external view returns(bool) {
+    function isSchemeRegistered(address _scheme,address _avatar) external isAvatarValid(_avatar) view returns(bool) {
         return _isSchemeRegistered(_scheme,_avatar);
     }
 
-    function getSchemeParameters(address _scheme,address _avatar) isAvatarValid(_avatar) external view returns(bytes32) {
+    function getSchemeParameters(address _scheme,address _avatar) external isAvatarValid(_avatar) view returns(bytes32) {
         return schemes[_scheme].paramsHash;
     }
 
-    function getSchemePermissions(address _scheme,address _avatar) isAvatarValid(_avatar) external view returns(bytes4) {
+    function getSchemePermissions(address _scheme,address _avatar) external isAvatarValid(_avatar) view returns(bytes4) {
         return schemes[_scheme].permissions;
     }
 
@@ -280,17 +280,17 @@ contract Controller is ControllerInterface {
     * @return uint globalConstraintsPost count.
     */
     function globalConstraintsCount(address _avatar)
-        isAvatarValid(_avatar)
         external
+        isAvatarValid(_avatar)
         view
         returns(uint,uint)
         {
         return (globalConstraintsPre.length,globalConstraintsPost.length);
     }
 
     function isGlobalConstraintRegistered(address _globalConstraint,address _avatar)
-        isAvatarValid(_avatar)
         external
+        isAvatarValid(_avatar)
         view
         returns(bool)
         {
@@ -530,11 +530,11 @@ contract Controller is ControllerInterface {
      * @param _avatar the organization avatar.
      * @return organization native reputation
      */
-    function getNativeReputation(address _avatar) isAvatarValid(_avatar) external view returns(address) {
+    function getNativeReputation(address _avatar) external isAvatarValid(_avatar) view returns(address) {
         return address(nativeReputation);
     }
 
-    function _isSchemeRegistered(address _scheme,address _avatar) isAvatarValid(_avatar) private view returns(bool) {
+    function _isSchemeRegistered(address _scheme,address _avatar) private isAvatarValid(_avatar) view returns(bool) {
         return (schemes[_scheme].permissions&bytes4(1) != bytes4(0));
     }
 }
diff --git a/contracts/controller/DAOToken.sol b/contracts/controller/DAOToken.sol
@@ -36,7 +36,7 @@ contract DAOToken is ERC827Token,MintableToken,BurnableToken {
      * @param _amount The amount of tokens to mint.
      * @return A boolean that indicates if the operation was successful.
      */
-    function mint(address _to, uint256 _amount) onlyOwner canMint public returns (bool) {
+    function mint(address _to, uint256 _amount) public onlyOwner canMint returns (bool) {
         if (cap > 0)
             require(totalSupply_.add(_amount) <= cap);
         return super.mint(_to, _amount);

diff --git a/contracts/controller/Reputation.sol b/contracts/controller/Reputation.sol
@@ -58,8 +58,8 @@ contract Reputation is Ownable {
     * @return True if the reputation are burned correctly
     */
     function burn(address _from, uint _amount)
-    onlyOwner
     public
+    onlyOwner
     returns (bool)
     {
         uint amountMinted = _amount;

diff --git a/contracts/libs/OrderStatisticTree.sol b/contracts/libs/OrderStatisticTree.sol
@@ -85,7 +85,7 @@ library OrderStatisticTree {
             n.height = heightRight+1;
     }
 
-    function balanceFactor(Tree storage _tree,uint _value) view private returns (int bf) {
+    function balanceFactor(Tree storage _tree,uint _value) private view returns (int bf) {
         Node storage n = _tree.nodes[_value];
         return int(_tree.nodes[n.children[false]].height)-int(_tree.nodes[n.children[true]].height);
     }
@@ -204,7 +204,7 @@ library OrderStatisticTree {
         }
     }
 
-    function rightmostLeaf(Tree storage _tree,uint _value) view private returns (uint leaf) {
+    function rightmostLeaf(Tree storage _tree,uint _value) private view returns (uint leaf) {
         uint child = _tree.nodes[_value].children[true];
         if (child!=0) {
             return rightmostLeaf(_tree,child);