From 4653e3fb0116874fdee5a903c6ccfaa6d22456d0 Mon Sep 17 00:00:00 2001
From: bas-vk <bas-vk@users.noreply.github.com>
Date: Fri, 17 Feb 2017 12:13:26 +0100
Subject: [PATCH] fix jslint warnings (#561)

---
 lib/utils/bloom.js | 115 ++++++++++++++++++++++++---------------------
 lib/utils/utils.js |   4 +-
 2 files changed, 63 insertions(+), 56 deletions(-)

diff --git a/lib/utils/bloom.js b/lib/utils/bloom.js
index 643118e..e56251b 100644
--- a/lib/utils/bloom.js
+++ b/lib/utils/bloom.js
@@ -1,3 +1,5 @@
+/*jshint bitwise: false*/
+
 /*
     This file is part of web3.js.
 
@@ -15,7 +17,7 @@
     along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/** 
+/**
  * @file bloom.js
  * @author Bas van Kervel <bas@ethereum.org>
  * @date 2017
@@ -28,72 +30,77 @@
  * @class [bloom] bloom
  */
 
-var utils = require('./utils.js');
-var sha3 = require('./sha3.js')
+var utils = require("./utils.js");
+var sha3 = require("./sha3.js");
 
 function codePointToInt(codePoint) {
-	if (codePoint >= 48 && codePoint <= 57) /*['0'..'9'] -> [0..9]*/
-		return codePoint-48;  
-	if (codePoint >= 65 && codePoint <= 70) /*['A'..'F'] -> [10..15]*/
-		return codePoint-55;
-	if (codePoint >= 97 && codePoint <= 102) /*['a'..'f'] -> [10..15]*/
-		return codePoint-87; 
-	
-	throw 'invalid bloom';
+    if (codePoint >= 48 && codePoint <= 57) { /*['0'..'9'] -> [0..9]*/
+        return codePoint-48;
+    }
+
+    if (codePoint >= 65 && codePoint <= 70) { /*['A'..'F'] -> [10..15]*/
+        return codePoint-55;
+    }
+
+    if (codePoint >= 97 && codePoint <= 102) { /*['a'..'f'] -> [10..15]*/
+        return codePoint-87;
+    }
+
+    throw "invalid bloom";
 }
 
 function testBytes(bloom, bytes) {
-	var hash = sha3(bytes, {encoding: 'hex'});
-	
-	for (var i=0; i < 12; i+=4) {
-		// calculate bit position in bloom fiter that must be active
-		var bitpos = ((parseInt(hash.substr(i, 2), 16) << 8) + parseInt(hash.substr((i+2), 2), 16)) & 2047;
-		
-		// test if bitpos in bloom is active
-		var code = codePointToInt(bloom.charCodeAt(bloom.length-1-Math.floor(bitpos/4)));
-		var offset = 1 << (bitpos % 4);
+    var hash = sha3(bytes, {encoding: "hex"});
 
-		if ((code & offset) != offset) {
-			return false;
-		}
-	}
-	
-	return true;
+    for (var i=0; i < 12; i+=4) {
+        // calculate bit position in bloom fiter that must be active
+        var bitpos = ((parseInt(hash.substr(i, 2), 16) << 8) + parseInt(hash.substr((i+2), 2), 16)) & 2047;
+
+        // test if bitpos in bloom is active
+        var code = codePointToInt(bloom.charCodeAt(bloom.length-1-Math.floor(bitpos/4)));
+        var offset = 1 << (bitpos % 4);
+
+        if ((code&offset) !== offset) {
+            return false;
+        }
+    }
+
+    return true;
 }
 
 /**
- * Returns true if address is part of the given bloom.
- * note: false positives are possible.
- * 
- * @method testAddress
- * @param {String} hex encoded bloom
- * @param {String} address in hex notation
- * @returns {Boolean} topic is (probably) part of the block
- */
+* Returns true if address is part of the given bloom.
+* note: false positives are possible.
+*
+* @method testAddress
+* @param {String} hex encoded bloom
+* @param {String} address in hex notation
+* @returns {Boolean} topic is (probably) part of the block
+*/
 var testAddress = function(bloom, address) {
-	if (!utils.isBloom(bloom)) throw 'invalid bloom';
-	if (!utils.isAddress(address)) throw 'invalid address';
-	
-	return testBytes(bloom, address);
-}
+    if (!utils.isBloom(bloom)) throw "invalid bloom";
+    if (!utils.isAddress(address)) throw "invalid address";
+
+    return testBytes(bloom, address);
+};
 
 /**
- * Returns true if the topic is part of the given bloom.
- * note: false positives are possible.
- *
- * @method hasTopic
- * @param {String} hex encoded bloom
- * @param {String} address in hex notation
- * @returns {Boolean} topic is (probably) part of the block 
- */
+* Returns true if the topic is part of the given bloom.
+* note: false positives are possible.
+*
+* @method hasTopic
+* @param {String} hex encoded bloom
+* @param {String} address in hex notation
+* @returns {Boolean} topic is (probably) part of the block
+*/
 var testTopic = function(bloom, topic) {
-	if (!utils.isBloom(bloom)) throw 'invalid bloom';
-	if (!utils.isTopic(topic)) throw 'invalid topic';
-	
-	return testBytes(bloom, topic);
-}
+    if (!utils.isBloom(bloom)) throw "invalid bloom";
+    if (!utils.isTopic(topic)) throw "invalid topic";
+
+    return testBytes(bloom, topic);
+};
 
 module.exports = {
-	testAddress: testAddress,
-	testTopic:   testTopic,
+    testAddress: testAddress,
+    testTopic:   testTopic,
 };
diff --git a/lib/utils/utils.js b/lib/utils/utils.js
index 045bdd5..653f2fe 100644
--- a/lib/utils/utils.js
+++ b/lib/utils/utils.js
@@ -577,7 +577,7 @@ var isBloom = function (bloom) {
         return true;
     } 
     return false;
-}
+};
 
 /**
  * Returns true if given string is a valid log topic.
@@ -593,7 +593,7 @@ var isTopic = function (topic) {
         return true;
     } 
     return false;
-}
+};
 
 module.exports = {
     padLeft: padLeft,