From 698e4204f91c2474c76a37a01df80910fe8cf9be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Almeida?= <contact@joaoalmeida.me>
Date: Wed, 13 Sep 2017 20:03:08 -0400
Subject: [PATCH] Lint errors fixed. Using os package to retrieve username
 dinamically. Changes code according to PR reviews #24

---
 app/lnd/config/index.js               |  4 +++-
 app/lnd/methods/channelController.js  |  8 +-------
 app/lnd/methods/index.js              |  2 +-
 app/lnd/methods/invoicesController.js | 20 ++++++++------------
 app/lnd/methods/networkController.js  | 23 +++++++++--------------
 app/lnd/methods/paymentsController.js |  9 ++-------
 app/lnd/methods/peersController.js    |  3 ---
 app/lnd/methods/walletController.js   |  9 ++-------
 8 files changed, 26 insertions(+), 52 deletions(-)

diff --git a/app/lnd/config/index.js b/app/lnd/config/index.js
index 178d5bb9..9bef2987 100644
--- a/app/lnd/config/index.js
+++ b/app/lnd/config/index.js
@@ -2,8 +2,10 @@
 // Mac OS X: /Users/user/Library/Application Support/Lnd/tls.cert
 // Linux: ~/.lnd/tls.cert
 // Windows: TODO find out where cert is located for windows machine
+import { userInfo } from 'os'
+
 export default {
   lightningRpc: `${__dirname}/rpc.proto`,
   lightningHost: 'localhost:10009',
-  cert: '/Users/joaoalmeida/Library/Application\ Support/Lnd/tls.cert'
+  cert: '/Users/'+ userInfo().username+'/Library/Application\ Support/Lnd/tls.cert'
 }
diff --git a/app/lnd/methods/channelController.js b/app/lnd/methods/channelController.js
index 32377e04..a508904b 100644
--- a/app/lnd/methods/channelController.js
+++ b/app/lnd/methods/channelController.js
@@ -20,7 +20,6 @@ export function openChannel(lnd, event, payload) {
   }
 
   return new Promise((resolve, reject) =>
-
     pushopenchannel(lnd, event, res)
       .then(data => resolve(data))
       .catch(error => reject(error))
@@ -35,7 +34,6 @@ export function openChannel(lnd, event, payload) {
  */
 export function channelBalance(lnd) {
   return new Promise((resolve, reject) => {
-
     lnd.channelBalance({}, (err, data) => {
       if (err) { reject(err) }
 
@@ -52,7 +50,6 @@ export function channelBalance(lnd) {
  */
 export function listChannels(lnd) {
   return new Promise((resolve, reject) => {
-
     lnd.listChannels({}, (err, data) => {
       if (err) { reject(err) }
 
@@ -79,7 +76,6 @@ export function closeChannel(lnd, event, payload) {
   }
 
   return new Promise((resolve, reject) =>
-
     pushclosechannel(lnd, event, res)
       .then(data => resolve(data))
       .catch(error => reject(error))
@@ -94,7 +90,6 @@ export function closeChannel(lnd, event, payload) {
  */
 export function pendingChannels(lnd) {
   return new Promise((resolve, reject) => {
-
     lnd.pendingChannels({}, (err, data) => {
       if (err) { reject(err) }
 
@@ -110,9 +105,8 @@ export function pendingChannels(lnd) {
  * @param  {[type]} channelId [description]
  * @return {[type]}           [description]
  */
-export function getChanInfo(lnd, { chanId }){
+export function getChanInfo(lnd, { chanId }) {
   return new Promise((resolve, reject) => {
-
     lnd.getChanInfo({ chan_id: chanId }, (err, data) => {
       if (err) { reject(err) }
 
diff --git a/app/lnd/methods/index.js b/app/lnd/methods/index.js
index b9ed9fc6..ab3129a8 100644
--- a/app/lnd/methods/index.js
+++ b/app/lnd/methods/index.js
@@ -38,7 +38,7 @@ export default function (lnd, event, msg, data) {
     case 'peers':
     // Data looks like { peers: [] }
       peersController.listPeers(lnd)
-        .then(peersData => event.sender.send('listPeers', peersData))
+        .then(peersData => event.sender.send('receivePeers', peersData))
         .catch(error => console.log('peers error: ', error))
       break
     case 'channels':
diff --git a/app/lnd/methods/invoicesController.js b/app/lnd/methods/invoicesController.js
index 230dbd37..0a2d1869 100644
--- a/app/lnd/methods/invoicesController.js
+++ b/app/lnd/methods/invoicesController.js
@@ -1,4 +1,5 @@
 import { decodeInvoice } from '../utils'
+import pushinvoices from '../push/subscribeinvoice'
 
 /**
  * Attempts to add a new invoice to the invoice database.
@@ -7,11 +8,11 @@ import { decodeInvoice } from '../utils'
  * @param  value [description]
  * @return     [description]
  */
-export function addInvoice (lnd, { memo, value }) {
+export function addInvoice(lnd, { memo, value }) {
   return new Promise((resolve, reject) => {
-
     lnd.addInvoice({ memo, value }, (err, data) => {
       if (err) { reject(err) }
+
       resolve(data)
     })
   })
@@ -24,7 +25,6 @@ export function addInvoice (lnd, { memo, value }) {
  */
 export function listInvoices(lnd) {
   return new Promise((resolve, reject) => {
-
     lnd.listInvoices({}, (err, data) => {
       if (err) { reject(err) }
 
@@ -39,13 +39,11 @@ export function listInvoices(lnd) {
  */
 export function getInvoice(payreq) {
   return new Promise((resolve, reject) => {
-
     try {
       resolve(decodeInvoice(payreq))
     } catch (error) {
       reject(error)
     }
-
   })
 }
 
@@ -57,10 +55,9 @@ export function getInvoice(payreq) {
  * @return {[type]}       [description]
  */
 export function lookupInvoice(lnd, { rhash }) {
-  return new Prommise ((resolve, reject) => {
-
-    lnd.lookupInvoice({r_hash: rhash}, (err, data) => {
-      if(err) { reject (err) }
+  return new Promise((resolve, reject) => {
+    lnd.lookupInvoice({ r_hash: rhash }, (err, data) => {
+      if (err) { reject(err) }
 
       resolve(data)
     })
@@ -76,9 +73,8 @@ export function lookupInvoice(lnd, { rhash }) {
  */
 export function subscribeInvoices(lnd, event) {
   return new Promise((resolve, reject) => {
-
     pushinvoices(lnd, event)
-    .then(data => resolve(data))
-    .catch(error => reject(error))
+      .then(data => resolve(data))
+      .catch(error => reject(error))
   })
 }
diff --git a/app/lnd/methods/networkController.js b/app/lnd/methods/networkController.js
index af965019..8cdd4cbe 100644
--- a/app/lnd/methods/networkController.js
+++ b/app/lnd/methods/networkController.js
@@ -5,7 +5,6 @@
  */
 export function getInfo(lnd) {
   return new Promise((resolve, reject) => {
-
     lnd.getInfo({}, (err, data) => {
       if (err) { reject(err) }
 
@@ -22,10 +21,9 @@ export function getInfo(lnd) {
  * @return {[type]}        [description]
  */
 export function getNodeInfo(lnd, { pubkey }) {
-  return new Promise ((resolve, reject) => {
-
-    lnd.getNodeInfo({ pub_key: pubkey}, (err, data) => {
-      if(err) { reject (err) }
+  return new Promise((resolve, reject) => {
+    lnd.getNodeInfo({ pub_key: pubkey }, (err, data) => {
+      if (err) { reject(err) }
 
       resolve(data)
     })
@@ -39,10 +37,9 @@ export function getNodeInfo(lnd, { pubkey }) {
  * @return {[type]}     [description]
  */
 export function describeGraph(lnd) {
-  return new Promise ((resolve, reject) => {
-
+  return new Promise((resolve, reject) => {
     lnd.describeGraph({}, (err, data) => {
-      if(err) { reject (err) }
+      if (err) { reject(err) }
 
       resolve(data)
     })
@@ -58,10 +55,9 @@ export function describeGraph(lnd) {
  * @return {[type]}        [description]
  */
 export function queryRoutes(lnd, { pubkey, amount }) {
-  return new Promise ((resolve, reject) => {
-
-    lnd.queryRoutes({pub_key: pubkey, amt: amount }, (err, data) => {
-      if(err) {reject (err) }
+  return new Promise((resolve, reject) => {
+    lnd.queryRoutes({ pub_key: pubkey, amt: amount }, (err, data) => {
+      if (err) { reject(err) }
 
       resolve(data)
     })
@@ -76,9 +72,8 @@ export function queryRoutes(lnd, { pubkey, amount }) {
  */
 export function getNetworkInfo(lnd) {
   return new Promise((resolve, reject) => {
-
     lnd.getNetworkInfo({}, (err, data) => {
-      if(err) { reject(err) }
+      if (err) { reject(err) }
 
       resolve(data)
     })
diff --git a/app/lnd/methods/paymentsController.js b/app/lnd/methods/paymentsController.js
index 76e6aacf..b59b64a7 100644
--- a/app/lnd/methods/paymentsController.js
+++ b/app/lnd/methods/paymentsController.js
@@ -6,7 +6,6 @@
  */
 export function sendPaymentSync(lnd, { paymentRequest }) {
   return new Promise((resolve, reject) => {
-
     lnd.sendPaymentSync({ payment_request: paymentRequest }, (err, data) => {
       if (err) { reject(err) }
 
@@ -24,7 +23,6 @@ export function sendPaymentSync(lnd, { paymentRequest }) {
  */
 export function sendPayment(lnd, { paymentRequest }) {
   return new Promise((resolve, reject) => {
-
     lnd.sendPayment({ payment_request: paymentRequest }, (err, data) => {
       if (err) { reject(err) }
 
@@ -41,8 +39,7 @@ export function sendPayment(lnd, { paymentRequest }) {
  */
 export function decodePayReq(lnd, { payReq }) {
   return new Promise((resolve, reject) => {
-
-    lnd.decodePayReq({ pay_req: payReq}, (err, data) => {
+    lnd.decodePayReq({ pay_req: payReq }, (err, data) => {
       if (err) { reject(err) }
 
       resolve(data)
@@ -57,7 +54,6 @@ export function decodePayReq(lnd, { payReq }) {
  */
 export function listPayments(lnd) {
   return new Promise((resolve, reject) => {
-
     lnd.listPayments({}, (err, data) => {
       if (err) { reject(err) }
 
@@ -73,9 +69,8 @@ export function listPayments(lnd) {
  */
 export function deleteAllPayments(lnd) {
   return new Promise((resolve, reject) => {
-
     lnd.deleteAllPayments({}, (err, data) => {
-      if(err) { reject(err) }
+      if (err) { reject(err) }
 
       resolve(data)
     })
diff --git a/app/lnd/methods/peersController.js b/app/lnd/methods/peersController.js
index ee480ca4..5e557eef 100644
--- a/app/lnd/methods/peersController.js
+++ b/app/lnd/methods/peersController.js
@@ -7,7 +7,6 @@
  */
 export function connectPeer(lnd, { pubkey, host }) {
   return new Promise((resolve, reject) => {
-
     lnd.connectPeer({ addr: { pubkey, host }, perm: true }, (err, data) => {
       if (err) { reject(err) }
 
@@ -25,7 +24,6 @@ export function connectPeer(lnd, { pubkey, host }) {
  */
 export function disconnectPeer(lnd, { pubkey }) {
   return new Promise((resolve, reject) => {
-
     lnd.disconnectPeer({ pub_key: pubkey }, (err, data) => {
       if (err) { reject(err) }
 
@@ -42,7 +40,6 @@ export function disconnectPeer(lnd, { pubkey }) {
  */
 export function listPeers(lnd) {
   return new Promise((resolve, reject) => {
-
     lnd.listPeers({}, (err, data) => {
       if (err) { reject(err) }
 
diff --git a/app/lnd/methods/walletController.js b/app/lnd/methods/walletController.js
index 0fa136cf..3053bbf1 100644
--- a/app/lnd/methods/walletController.js
+++ b/app/lnd/methods/walletController.js
@@ -5,7 +5,6 @@
  */
 export function walletBalance(lnd) {
   return new Promise((resolve, reject) => {
-
     lnd.walletBalance({}, (err, data) => {
       if (err) { reject(err) }
 
@@ -23,8 +22,7 @@ export function walletBalance(lnd) {
  */
 export function newAddress(lnd, type) {
   return new Promise((resolve, reject) => {
-
-    lnd.newAddress({type}, (err, data) => {
+    lnd.newAddress({ type }, (err, data) => {
       if (err) { reject(err) }
 
       resolve(data)
@@ -39,8 +37,7 @@ export function newAddress(lnd, type) {
  */
 export function newWitnessAddress(lnd, { addr }) {
   return new Promise((resolve, reject) => {
-
-    lnd.newWitnessAddress({ address: addr}, (err, data) => {
+    lnd.newWitnessAddress({ address: addr }, (err, data) => {
       if (err) { reject(err) }
 
       resolve(data)
@@ -56,7 +53,6 @@ export function newWitnessAddress(lnd, { addr }) {
  */
 export function getTransactions(lnd) {
   return new Promise((resolve, reject) => {
-
     lnd.getTransactions({}, (err, data) => {
       if (err) { reject(err) }
 
@@ -75,7 +71,6 @@ export function getTransactions(lnd) {
  */
 export function sendCoins(lnd, { addr, amount }) {
   return new Promise((resolve, reject) => {
-
     lnd.sendCoins({ addr, amount }, (err, data) => {
       if (err) { reject(err) }