removing variable shadowing

layr-team · Mar 29, 2018 · 9de3760 · 9de3760
1 parent b236d26
commit 9de3760
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/batnode.js b/batnode.js
@@ -248,7 +248,7 @@ class BatNode {
 
     this.kadenceNode.iterativeFindValue(shardId, (err, value, responder) => {
       let kadNodeTarget = value.value;
-      this.kadenceNode.getOtherBatNodeContact(kadNodeTarget, (err, batNode) => {
+      this.kadenceNode.getOtherBatNodeContact(kadNodeTarget, (error, batNode) => {
         this.auditShardData(batNode, shards, shaIdx, shardDupIdx, shardAuditData)
       })
     })

diff --git a/seednode/seed.js b/seednode/seed.js
@@ -41,23 +41,23 @@ publicIp.v4().then(ip => {
      console.log("received data: ", receivedData)
 
       if (receivedData.messageType === "RETRIEVE_FILE") {
-        batNode.readFile(`./hosted/${receivedData.fileName}`, (error, data) => {
+        batNode.readFile(`./hosted/${receivedData.fileName}`, (err, data) => {
          serverConnection.write(data)
         })
       } else if (receivedData.messageType === "STORE_FILE"){
         let fileName = receivedData.fileName
         batNode.kadenceNode.iterativeStore(fileName, [batNode.kadenceNode.identity.toString(), batNode.kadenceNode.contact], (err, stored) => {
           console.log('nodes who stored this value: ', stored)
           let fileContent = new Buffer(receivedData.fileContent)
-          batNode.writeFile(`./hosted/${fileName}`, fileContent, (err) => {
-            if (err) {
-              throw err;
+          batNode.writeFile(`./hosted/${fileName}`, fileContent, (writeErr) => {
+            if (writeErr) {
+              throw writeErr;
             }
             serverConnection.write(JSON.stringify({messageType: "SUCCESS"}))
           })
         })
       } else if (receivedData.messageType === "AUDIT_FILE") {
-        fs.readFile(`./hosted/${receivedData.fileName}`, (error, data) => {
+        fs.readFile(`./hosted/${receivedData.fileName}`, (err, data) => {
           const shardSha1 = fileUtils.sha1HashData(data);
           serverConnection.write(shardSha1);
         });

diff --git a/start.js b/start.js
@@ -14,7 +14,7 @@ const fs = require('fs');
 const fileUtils = require('./utils/file').fileSystem;
 
 publicIp.v4().then(ip => {
-  kademliaNode = new kad.KademliaNode({
+ const kademliaNode = new kad.KademliaNode({
     transport: new kad.HTTPTransport(),
     storage: levelup(encoding(leveldown('./dbbb'))),
     contact: {hostname: ip, port: kadNodePort}
@@ -34,23 +34,23 @@ publicIp.v4().then(ip => {
      console.log("received data: ", receivedData)
 
       if (receivedData.messageType === "RETRIEVE_FILE") {
-        batNode.readFile(`./hosted/${receivedData.fileName}`, (error, data) => {
+        batNode.readFile(`./hosted/${receivedData.fileName}`, (err, data) => {
          serverConnection.write(data)
         })
       } else if (receivedData.messageType === "STORE_FILE"){
         let fileName = receivedData.fileName
         batNode.kadenceNode.iterativeStore(fileName, [batNode.kadenceNode.identity.toString(), batNode.kadenceNode.contact], (err, stored) => {
           console.log('nodes who stored this value: ', stored)
           let fileContent = new Buffer(receivedData.fileContent)
-          batNode.writeFile(`./hosted/${fileName}`, fileContent, (err) => {
-            if (err) {
-              throw err;
+          batNode.writeFile(`./hosted/${fileName}`, fileContent, (writeErr) => {
+            if (writeErr) {
+              throw writeErr;
             }
             serverConnection.write(JSON.stringify({messageType: "SUCCESS"}))
           })
         })
       } else if (receivedData.messageType === "AUDIT_FILE") {
-        fs.readFile(`./hosted/${receivedData.fileName}`, (error, data) => {
+        fs.readFile(`./hosted/${receivedData.fileName}`, (err, data) => {
           const shardSha1 = fileUtils.sha1HashData(data);
           serverConnection.write(shardSha1);
         });

diff --git a/utils/file.js b/utils/file.js
@@ -32,11 +32,11 @@ exports.fileSystem = (function(){
 
     const fileData = fileSystem.createReadStream(filepath)
     const zip = zlib.createGzip()
-    const encrypt = crypto.createCipher(algorithm, privateKey)
+    const encryptStream = crypto.createCipher(algorithm, privateKey)
     const encryptedFileStore = fileSystem.createWriteStream(tmpPath)
 
     // read the file, zip it, encrypt it, and write it
-    fileData.pipe(zip).pipe(encrypt).pipe(encryptedFileStore).on('close', () => {
+    fileData.pipe(zip).pipe(encryptStream).pipe(encryptedFileStore).on('close', () => {
       if(callback) {
         callback(tmpPath)
       }
@@ -47,11 +47,11 @@ exports.fileSystem = (function(){
     const privateKey = dotenv.config().parsed.PRIVATE_KEY;
 
     const encryptedFileData = fileSystem.createReadStream(filepath)
-    const decrypt = crypto.createDecipher(algorithm, privateKey)
+    const decryptStream = crypto.createDecipher(algorithm, privateKey)
     const unzip = zlib.createGunzip()
     const writeStream = fileSystem.createWriteStream(tempPath)
     //
-    encryptedFileData.pipe(decrypt).pipe(unzip).pipe(writeStream)
+    encryptedFileData.pipe(decryptStream).pipe(unzip).pipe(writeStream)
   }
   const sha1Hash = (file) => {
     const fileData = fileSystem.readFileSync(file)