JavaScript Standard Style

1 files changed, 16 insertions, 12 deletions

diff --git a/lib/storage.js b/lib/storage.js
index 570ae08..e6f1417 100644
--- a/lib/storage.js
+++ b/lib/storage.js
@@ -27,7 +27,7 @@ inherits(Piece, EventEmitter)
  *
  * @param {number} index  piece index
  * @param {string} hash   sha1 hash (hex) for this piece
- * @param {Buffer|number} buffer backing buffer for this piece or length of piece if the backing buffer is lazy
+ * @param {Buffer|number} buffer backing buffer, or piece length if backing buffer is lazy
  * @param {boolean=} noVerify skip piece verification (used when seeding a new file)
  */
 function Piece (index, hash, buffer, noVerify) {
@@ -138,9 +138,7 @@ Piece.prototype.verify = function (buffer) {
     return
   }
 
-  var expectedHash
-  sha1(buffer, function (_expectedHash) {
-    expectedHash = _expectedHash
+  sha1(buffer, function (expectedHash) {
     self.verified = (expectedHash === self.hash)
     onResult()
   })
@@ -149,7 +147,7 @@ Piece.prototype.verify = function (buffer) {
     if (self.verified) {
       self.emit('done')
     } else {
-      self.emit('warning', new Error('piece ' + self.index + ' failed verification; ' + expectedHash + ' expected ' + self.hash))
+      self.emit('warning', new Error('piece ' + self.index + ' failed verification'))
       self._reset()
     }
   }
@@ -160,7 +158,10 @@ Piece.prototype._verifyOffset = function (offset) {
   if (offset % BLOCK_LENGTH === 0) {
     return true
   } else {
-    self.emit('warning', new Error('piece ' + self.index + ' invalid offset ' + offset + ' not multiple of ' + BLOCK_LENGTH + ' bytes'))
+    self.emit(
+      'warning',
+      new Error('invalid block offset ' + offset + ', not multiple of ' + BLOCK_LENGTH)
+    )
     return false
   }
 }
@@ -170,13 +171,12 @@ Piece.prototype._verifyBlock = function (offset, buffer) {
   if (buffer.length === BLOCK_LENGTH) {
     // normal block length
     return true
-
-  } else if (buffer.length === self.length - offset
-      && self.length - offset < BLOCK_LENGTH) {
+  } else if (buffer.length === self.length - offset &&
+    self.length - offset < BLOCK_LENGTH) {
     // last block in piece is allowed to be less than block length
     return true
   } else {
-    self.emit('warning', new Error('piece ' + self.index + ' invalid block of size ' + buffer.length + ' bytes'))
+    self.emit('warning', new Error('invalid block size ' + buffer.length))
     return false
   }
 }
@@ -230,7 +230,9 @@ function File (storage, file, pieces, pieceLength) {
 File.prototype.select = function () {
   var self = this
   if (self.pieces.length > 0) {
-    self.storage.emit('select', self.pieces[0].index, self.pieces[self.pieces.length - 1].index, false)
+    var start = self.pieces[0].index
+    var end = self.pieces[self.pieces.length - 1].index
+    self.storage.emit('select', start, end, false)
   }
 }
 
@@ -241,7 +243,9 @@ File.prototype.select = function () {
 File.prototype.deselect = function () {
   var self = this
   if (self.pieces.length > 0) {
-    self.storage.emit('deselect', self.pieces[0].index, self.pieces[self.pieces.length - 1].index, false)
+    var start = self.pieces[0].index
+    var end = self.pieces[self.pieces.length - 1].index
+    self.storage.emit('deselect', start, end, false)
   }
 }