Merge pull request ethereumjs#428 from ethereumjs/refactor/bloom-es6

holgerd77 · web-flow · commit cca3f095d860 · 2019-01-29T16:21:06.000+01:00
Convert Bloom to es6 class
diff --git a/lib/bloom/index.js b/lib/bloom/index.js
@@ -1,83 +1,83 @@
 const assert = require('assert')
 const utils = require('ethereumjs-util')
-const byteSize = 256
 
-/**
- * Represents a Bloom
- * @constructor
- * @param {Buffer} bitvector
- */
-var Bloom = module.exports = function (bitvector) {
-  if (!bitvector) {
-    this.bitvector = utils.zeros(byteSize)
-  } else {
-    assert(bitvector.length === byteSize, 'bitvectors must be 2048 bits long')
-    this.bitvector = bitvector
+const BYTE_SIZE = 256
+
+module.exports = class Bloom {
+  /**
+   * Represents a Bloom
+   * @constructor
+   * @param {Buffer} bitvector
+   */
+  constructor (bitvector) {
+    if (!bitvector) {
+      this.bitvector = utils.zeros(BYTE_SIZE)
+    } else {
+      assert(bitvector.length === BYTE_SIZE, 'bitvectors must be 2048 bits long')
+      this.bitvector = bitvector
+    }
   }
-}
 
-/**
- * adds an element to a bit vector of a 64 byte bloom filter
- * @method add
- * @param {Buffer} e the element to add
- */
-Bloom.prototype.add = function (e) {
-  e = utils.keccak256(e)
-  var mask = 2047 // binary 11111111111
+  /**
+   * adds an element to a bit vector of a 64 byte bloom filter
+   * @method add
+   * @param {Buffer} e the element to add
+   */
+  add (e) {
+    e = utils.keccak256(e)
+    const mask = 2047 // binary 11111111111
 
-  for (var i = 0; i < 3; i++) {
-    var first2bytes = e.readUInt16BE(i * 2)
-    var loc = mask & first2bytes
-    var byteLoc = loc >> 3
-    var bitLoc = 1 << loc % 8
-    this.bitvector[byteSize - byteLoc - 1] |= bitLoc
+    for (let i = 0; i < 3; i++) {
+      const first2bytes = e.readUInt16BE(i * 2)
+      const loc = mask & first2bytes
+      const byteLoc = loc >> 3
+      const bitLoc = 1 << loc % 8
+      this.bitvector[BYTE_SIZE - byteLoc - 1] |= bitLoc
+    }
   }
-}
 
-/**
- * checks if an element is in the bloom
- * @method check
- * @param {Buffer} e the element to check
- * @returns {boolean} Returns {@code true} if the element is in the bloom
- */
-Bloom.prototype.check = function (e) {
-  e = utils.keccak256(e)
-  var mask = 2047 // binary 11111111111
-  var match = true
+  /**
+   * checks if an element is in the bloom
+   * @method check
+   * @param {Buffer} e the element to check
+   * @returns {boolean} Returns {@code true} if the element is in the bloom
+   */
+  check (e) {
+    e = utils.keccak256(e)
+    const mask = 2047 // binary 11111111111
+    let match = true
 
-  for (var i = 0; i < 3 && match; i++) {
-    var first2bytes = e.readUInt16BE(i * 2)
-    var loc = mask & first2bytes
-    var byteLoc = loc >> 3
-    var bitLoc = 1 << loc % 8
-    match = (this.bitvector[byteSize - byteLoc - 1] & bitLoc)
-  }
+    for (let i = 0; i < 3 && match; i++) {
+      const first2bytes = e.readUInt16BE(i * 2)
+      const loc = mask & first2bytes
+      const byteLoc = loc >> 3
+      const bitLoc = 1 << loc % 8
+      match = (this.bitvector[BYTE_SIZE - byteLoc - 1] & bitLoc)
+    }
 
-  return Boolean(match)
-}
+    return Boolean(match)
+  }
 
-/**
- * checks if multiple topics are in a bloom
- * @method multiCheck
- * @param {Buffer} topics
- * @returns {boolean} Returns {@code true} if every topic is in the bloom
- */
-Bloom.prototype.multiCheck = function (topics) {
-  var self = this
-  return topics.every(function (t) {
-    return self.check(t)
-  })
-}
+  /**
+   * checks if multiple topics are in a bloom
+   * @method multiCheck
+   * @param {Buffer} topics
+   * @returns {boolean} Returns {@code true} if every topic is in the bloom
+   */
+  multiCheck (topics) {
+    return topics.every((t) => this.check(t))
+  }
 
-/**
- * bitwise or blooms together
- * @method or
- * @param {Bloom} bloom
- */
-Bloom.prototype.or = function (bloom) {
-  if (bloom) {
-    for (var i = 0; i <= byteSize; i++) {
-      this.bitvector[i] = this.bitvector[i] | bloom.bitvector[i]
+  /**
+   * bitwise or blooms together
+   * @method or
+   * @param {Bloom} bloom
+   */
+  or (bloom) {
+    if (bloom) {
+      for (let i = 0; i <= BYTE_SIZE; i++) {
+        this.bitvector[i] = this.bitvector[i] | bloom.bitvector[i]
+      }
     }
   }
 }
