Merge pull request #1136 from meritlabs/chore/prettier

Code style

Makefile

@@ -201,5 +201,5 @@ test-all: test-merit-rpc \
 .PHONY: fmt
 fmt:
 	node_modules/.bin/prettier --parser typescript --write "packages/**/*.{ts,js}" || true
-	node_modules/.bin/prettier --parser scss --write "packages/**/*.{scss,sass}" || true
+#	node_modules/.bin/prettier --parser scss --write "packages/**/*.{scss,sass}" || true
 	node_modules/.bin/prettier --parser markdown --write "**/*.md" || true

README.md

@@ -16,7 +16,7 @@ The lightwallet development environment consists of:
 
 Make sure the following conditions are met
 
-- GNU/Linux x86_32/x86_64, or OSX 64bit _(for meritd distributed binaries)_
+- GNU/Linux x86*32/x86_64, or OSX 64bit *(for meritd distributed binaries)\_
 - ZeroMQ _(libzmq3-dev for Ubuntu/Debian or zeromq on OSX)_
 - GNU Make version 4.2.1
 - The lightwallet-stack stably tested on Node.js >= v4.8.4

package.json

@@ -14,6 +14,6 @@
   "dependencies": {},
   "devDependencies": {
     "lerna": "^3.4.0",
-    "prettier": "^1.14.3"
+    "prettier": "^1.15.3"
   }
 }

packages/insight-api/lib/addresses.js

@@ -11,13 +11,13 @@ const COINBASE_MATURITY = meritcore.Block.COINBASE_MATURITY;
 function AddressController(node) {
   this.node = node;
   this.txController = new TxController(node);
-  this.common = new Common({log: this.node.log});
-};
+  this.common = new Common({ log: this.node.log });
+}
 
 AddressController.prototype.show = function(req, res) {
   var self = this;
   var options = {
-    noTxList: parseInt(req.query.noTxList)
+    noTxList: parseInt(req.query.noTxList),
   };
 
   if (req.query.from && req.query.to) {
@@ -26,7 +26,7 @@ AddressController.prototype.show = function(req, res) {
   }
 
   this.getAddressSummary(req.addr, options, function(err, data) {
-    if(err) {
+    if (err) {
       return self.common.handleErrors(err, res);
     }
 
@@ -53,7 +53,7 @@ AddressController.prototype.unconfirmedBalance = function(req, res) {
 AddressController.prototype.addressSummarySubQuery = function(req, res, param) {
   var self = this;
   this.getAddressSummary(req.addr, {}, function(err, data) {
-    if(err) {
+    if (err) {
       return self.common.handleErrors(err, res);
     }
 
@@ -62,9 +62,8 @@ AddressController.prototype.addressSummarySubQuery = function(req, res, param) {
 };
 
 AddressController.prototype.getAddressSummary = function(address, options, callback) {
-
   this.node.getAddressSummary(address, options, function(err, summary) {
-    if(err) {
+    if (err) {
       return callback(err);
     }
 
@@ -80,7 +79,7 @@ AddressController.prototype.getAddressSummary = function(address, options, callb
       unconfirmedBalanceMicros: summary.unconfirmedBalance,
       unconfirmedTxApperances: summary.unconfirmedAppearances, // misspelling - ew
       txApperances: summary.appearances, // yuck
-      transactions: summary.txids
+      transactions: summary.txids,
     };
 
     callback(null, transformed);
@@ -91,10 +90,13 @@ AddressController.prototype.checkAddr = function(req, res, next) {
   req.addr = req.params.addr;
 
   if (this.check(req, res, next, [req.addr])) {
-    return this.common.handleErrors({
-      message: 'Must include address',
-      code: 1
-    }, res);
+    return this.common.handleErrors(
+      {
+        message: 'Must include address',
+        code: 1,
+      },
+      res,
+    );
   }
 
   next();
@@ -103,57 +105,69 @@ AddressController.prototype.checkAddr = function(req, res, next) {
 AddressController.prototype.checkAddrOrAlias = function(req, res, next) {
   req.addr = req.params.addr;
   if (this.check(req, res, next, [req.addr] || !this.checkAlias(req, res, next, [req.addr]))) {
-    return this.common.handleErrors({
-      message: 'Invalid address: ' + + req.addr,
-      code: 1
-    }, res);
+    return this.common.handleErrors(
+      {
+        message: 'Invalid address: ' + +req.addr,
+        code: 1,
+      },
+      res,
+    );
   }
 
   next();
 };
 
 AddressController.prototype.checkAddrs = function(req, res, next) {
-  if(req.body.addrs) {
+  if (req.body.addrs) {
     req.addrs = req.body.addrs.split(',');
   } else {
     req.addrs = req.params.addrs.split(',');
   }
 
   if (this.check(req, res, next, req.addrs)) {
-    return this.common.handleErrors({
-      message: 'Must include address',
-      code: 1
-    }, res);
+    return this.common.handleErrors(
+      {
+        message: 'Must include address',
+        code: 1,
+      },
+      res,
+    );
   }
 
   next();
 };
 
 AddressController.prototype.check = function(req, res, next, addresses) {
   if (!addresses.length || !addresses[0]) {
-    return this.common.handleErrors({
-      message: 'Must include address',
-      code: 1
-    }, res);
+    return this.common.handleErrors(
+      {
+        message: 'Must include address',
+        code: 1,
+      },
+      res,
+    );
   }
 
   addresses = _.reject(addresses, _.isEmpty);
 
-  for(var i = 0; i < addresses.length; i++) {
+  for (var i = 0; i < addresses.length; i++) {
     try {
-       new meritcore.Address(addresses[i]);
-    } catch(e) {
+      new meritcore.Address(addresses[i]);
+    } catch (e) {
       return false;
     }
   }
 };
 
 AddressController.prototype.checkAlias = function(req, res, next, aliases) {
-  if(!aliases.length || !aliases[0]) {
-    return this.common.handleErrors({
-      message: 'Must include alias',
-      code: 1
-    }, res);
+  if (!aliases.length || !aliases[0]) {
+    return this.common.handleErrors(
+      {
+        message: 'Must include alias',
+        code: 1,
+      },
+      res,
+    );
   }
 
   aliases = _.reject(aliases, _.isEmpty);
@@ -166,11 +180,14 @@ AddressController.prototype.validateAddress = function(req, res) {
   const address = req.addr;
 
   this.node.validateAddress(address, function(err, response) {
-    if (err || !response.result)  {
-      return self.common.handleErrors({
-        message: 'Invalid address: ' + err.message,
-        code: 1
-      }, res);
+    if (err || !response.result) {
+      return self.common.handleErrors(
+        {
+          message: 'Invalid address: ' + err.message,
+          code: 1,
+        },
+        res,
+      );
     }
 
     const info = response.result;
@@ -181,15 +198,15 @@ AddressController.prototype.validateAddress = function(req, res) {
       isValid: !!info.isvalid,
       isBeaconed: !!info.isbeaconed,
       isConfirmed: !!info.isconfirmed,
-     });
+    });
   });
 };
 
 AddressController.prototype.utxo = function(req, res) {
   var self = this;
 
   this.node.getAddressUnspentOutputs(req.addr, {}, function(err, utxos) {
-    if(err) {
+    if (err) {
       return self.common.handleErrors(err, res);
     } else if (!utxos.length) {
       return res.jsonp([]);
@@ -200,9 +217,9 @@ AddressController.prototype.utxo = function(req, res) {
 
 AddressController.prototype.multiutxo = function(req, res) {
   this.node.getAddressUnspentOutputs(req.addrs, { invites: req.body.invites }, (err, utxos) => {
-    if(err && err.code === -5) {
+    if (err && err.code === -5) {
       return res.jsonp([]);
-    } else if(err) {
+    } else if (err) {
       return this.common.handleErrors(err, res);
     }
 
@@ -241,45 +258,44 @@ AddressController.prototype._getTransformOptions = function(req) {
   return {
     noAsm: parseInt(req.query.noAsm) ? true : false,
     noScriptSig: parseInt(req.query.noScriptSig) ? true : false,
-    noSpent: parseInt(req.query.noSpent) ? true : false
+    noSpent: parseInt(req.query.noSpent) ? true : false,
   };
 };
 
 AddressController.prototype.referrals = function(req, res, next) {
-    var self = this;
-
-    var options = {
-        from: parseInt(req.query.from) || parseInt(req.body.from) || 0
-    };
+  var self = this;
 
-    options.to = parseInt(req.query.to) || parseInt(req.body.to) || parseInt(options.from) + 10;
+  var options = {
+    from: parseInt(req.query.from) || parseInt(req.body.from) || 0,
+  };
 
-    self.node.getAddressReferrals(req.addrs, options, function(err, result) {
-        if(err) {
-            return self.common.handleErrors(err, res);
-        }
+  options.to = parseInt(req.query.to) || parseInt(req.body.to) || parseInt(options.from) + 10;
 
-        return res.jsonp({
-            totalItems: result.totalCount,
-            from: options.from,
-            to: Math.min(options.to, result.totalCount),
-            items: result.items
-        });
+  self.node.getAddressReferrals(req.addrs, options, function(err, result) {
+    if (err) {
+      return self.common.handleErrors(err, res);
+    }
 
+    return res.jsonp({
+      totalItems: result.totalCount,
+      from: options.from,
+      to: Math.min(options.to, result.totalCount),
+      items: result.items,
     });
+  });
 };
 
 AddressController.prototype.multitxs = function(req, res, next) {
   var self = this;
 
   var options = {
-    from: parseInt(req.query.from) || parseInt(req.body.from) || 0
+    from: parseInt(req.query.from) || parseInt(req.body.from) || 0,
   };
 
   options.to = parseInt(req.query.to) || parseInt(req.body.to) || parseInt(options.from) + 10;
 
   self.node.getAddressHistory(req.addrs, options, function(err, result) {
-    if(err) {
+    if (err) {
       return self.common.handleErrors(err, res);
     }
 
@@ -293,28 +309,29 @@ AddressController.prototype.multitxs = function(req, res, next) {
         totalItems: result.totalCount,
         from: options.from,
         to: Math.min(options.to, result.totalCount),
-        items: items
+        items: items,
       });
     });
-
   });
 };
 
 AddressController.prototype.transformAddressHistoryForMultiTxs = function(txinfos, options, callback) {
   var self = this;
 
-  var items = txinfos.map(function(txinfo) {
-    return txinfo.tx;
-  }).filter(function(value, index, itemArr) {
-    return itemArr.indexOf(value) === index;
-  });
+  var items = txinfos
+    .map(function(txinfo) {
+      return txinfo.tx;
+    })
+    .filter(function(value, index, itemArr) {
+      return itemArr.indexOf(value) === index;
+    });
 
   async.map(
     items,
     function(item, next) {
       self.txController.transformTransaction(item, options, next);
     },
-    callback
+    callback,
   );
 };