50-max-states-count-in-contract

destenson · Oct 2, 2017 · 8653b68 · 8653b68
1 parent 5610448
commit 8653b68
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/lib/common/tree-traversing.js b/lib/common/tree-traversing.js
@@ -70,9 +70,12 @@ class TreeTraversing {
 
 
 TreeTraversing.typeOf = function (ctx) {
+    if (!ctx) {
+        return '';
+    }
+
     const className = ctx.constructor.name;
     const typeName = className.replace('Context', '');
-
     return typeName[0].toLowerCase() + typeName.substring(1);
 };
 

diff --git a/lib/rules/align/brackets-align.js b/lib/rules/align/brackets-align.js
@@ -29,10 +29,6 @@ class BracketsAlign extends BaseChecker {
         this.validateBlock(ctx);
     }
 
-    enterFunctionCallArguments(ctx) {
-        this.validateBlock(ctx);
-    }
-
     validateBlock(ctx) {
         if (typeOf(ctx.parentCtx) === 'functionDefinition') {
             return;
@@ -64,7 +60,6 @@ class BracketsAlign extends BaseChecker {
         const message = 'Open bracket must be on same line. It must be indented by other constructions by space';
         this.error(ctx, 'bracket-align', message);
     }
-
 }
 
 

diff --git a/lib/rules/best-practises/no-unused-vars.js b/lib/rules/best-practises/no-unused-vars.js
@@ -37,6 +37,12 @@ class NoUnusedVarsChecker extends BaseChecker {
         this._trackVarUsage(ctx);
     }
 
+    enterAssemblyCall(ctx) {
+        const firstChild = _.first(ctx.children);
+
+        firstChild && this._trackVarUsage(firstChild);
+    }
+
     exitFunctionDefinition(ctx) {
         VarUsageScope.isActivated(ctx) && this._reportErrorsFor(ctx);
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "solhint",
-  "version": "1.1.1",
+  "version": "1.1.4",
   "description": "Solidity Code Linter",
   "main": "solhint.js",
   "keywords": [

diff --git a/solhint.js b/solhint.js
@@ -9,7 +9,7 @@ const process = require('process');
 
 function init () {
     program
-        .version('1.1.1');
+        .version('1.1.4');
 
     program
         .usage('[options] <file> [...other_files]')

diff --git a/test/best-practise-rules.js b/test/best-practise-rules.js
@@ -78,7 +78,8 @@ describe('Linter', function() {
             contractWith('function a(uint a) public { uint b = bytes32(a); b += 1; }'),
             contractWith('function a() public returns (uint c) { return 1; }'),
             contractWith('function a(uint d) public returns (uint c) { }'),
-            contractWith('function a(uint a, uint c) public returns (uint c);')
+            contractWith('function a(uint a, uint c) public returns (uint c);'),
+            contractWith('function a(address a) internal { assembly { t := eq(a, and(mask, calldataload(4))) } }')
         ];
 
         USED_VARS.forEach(curData =>