Enable indent linting via ESLint (#6936)

* Enable indent linting via ESLint * yarn run lint:fix
MetaMask · Jul 31, 2019 · 4d88e1c · 4d88e1c
1 parent e9c7df2
commit 4d88e1c
Show file tree

Hide file tree

Showing 118 changed files with 1,641 additions and 1,641 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -59,7 +59,7 @@
     "eqeqeq": [2, "allow-null"],
     "generator-star-spacing": [2, { "before": true, "after": true }],
     "handle-callback-err": [2, "^(err|error)$" ],
-    "indent": "off",
+    "indent": [2, 2,{ "SwitchCase": 1 }],
     "jsx-quotes": [2, "prefer-double"],
     "key-spacing": 2,
     "keyword-spacing": [2, { "before": true, "after": true }],

diff --git a/app/scripts/controllers/computed-balances.js b/app/scripts/controllers/computed-balances.js
@@ -65,7 +65,7 @@ class ComputedbalancesController {
   syncAllAccountsFromStore (store) {
     const upstream = Object.keys(store.accounts)
     const balances = Object.keys(this.balances)
-    .map(address => this.balances[address])
+      .map(address => this.balances[address])
 
     // Follow new addresses
     for (const address in balances) {

diff --git a/app/scripts/controllers/detect-tokens.js b/app/scripts/controllers/detect-tokens.js
@@ -54,7 +54,7 @@ class DetectTokensController {
     })
   }
 
-   /**
+  /**
    * Find if selectedAddress has tokens with contract in contractAddress.
    *
    * @param {string} contractAddress Hex address of the token contract to explore.

diff --git a/app/scripts/controllers/network/contract-addresses.js b/app/scripts/controllers/network/contract-addresses.js
@@ -4,8 +4,8 @@ const SINGLE_CALL_BALANCES_ADDRESS_ROPSTEN = '0xb8e671734ce5c8d7dfbbea5574fa4cf3
 const SINGLE_CALL_BALANCES_ADDRESS_KOVAN = '0xb1d3fbb2f83aecd196f474c16ca5d9cffa0d0ffc'
 
 module.exports = {
-    SINGLE_CALL_BALANCES_ADDRESS,
-    SINGLE_CALL_BALANCES_ADDRESS_RINKEBY,
-    SINGLE_CALL_BALANCES_ADDRESS_ROPSTEN,
-    SINGLE_CALL_BALANCES_ADDRESS_KOVAN,
+  SINGLE_CALL_BALANCES_ADDRESS,
+  SINGLE_CALL_BALANCES_ADDRESS_RINKEBY,
+  SINGLE_CALL_BALANCES_ADDRESS_ROPSTEN,
+  SINGLE_CALL_BALANCES_ADDRESS_KOVAN,
 }
diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
@@ -68,7 +68,7 @@ class PreferencesController {
       return this.setFeatureFlag(key, value)
     }
   }
-// PUBLIC METHODS
+  // PUBLIC METHODS
 
   /**
    * Sets the {@code forgottenPassword} state property
@@ -129,9 +129,9 @@ class PreferencesController {
    * @param {String} type Indicates the type of first time flow - create or import - the user wishes to follow
    *
    */
-   setFirstTimeFlowType (type) {
-     this.store.updateState({ firstTimeFlowType: type })
-   }
+  setFirstTimeFlowType (type) {
+    this.store.updateState({ firstTimeFlowType: type })
+  }
 
 
   getSuggestedTokens () {
@@ -493,22 +493,22 @@ class PreferencesController {
    * @returns {Promise<array>} Promise resolving to updated frequentRpcList.
    *
    */
-    addToFrequentRpcList (url, chainId, ticker = 'ETH', nickname = '', rpcPrefs = {}) {
-      const rpcList = this.getFrequentRpcListDetail()
-      const index = rpcList.findIndex((element) => { return element.rpcUrl === url })
-      if (index !== -1) {
-        rpcList.splice(index, 1)
-      }
-      if (url !== 'http://localhost:8545') {
-        let checkedChainId
-        if (!!chainId && !Number.isNaN(parseInt(chainId))) {
-          checkedChainId = chainId
-        }
-        rpcList.push({ rpcUrl: url, chainId: checkedChainId, ticker, nickname, rpcPrefs })
+  addToFrequentRpcList (url, chainId, ticker = 'ETH', nickname = '', rpcPrefs = {}) {
+    const rpcList = this.getFrequentRpcListDetail()
+    const index = rpcList.findIndex((element) => { return element.rpcUrl === url })
+    if (index !== -1) {
+      rpcList.splice(index, 1)
+    }
+    if (url !== 'http://localhost:8545') {
+      let checkedChainId
+      if (!!chainId && !Number.isNaN(parseInt(chainId))) {
+        checkedChainId = chainId
       }
-      this.store.updateState({ frequentRpcListDetail: rpcList })
-      return Promise.resolve(rpcList)
+      rpcList.push({ rpcUrl: url, chainId: checkedChainId, ticker, nickname, rpcPrefs })
     }
+    this.store.updateState({ frequentRpcListDetail: rpcList })
+    return Promise.resolve(rpcList)
+  }
 
   /**
    * Removes custom RPC url from state.

diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
@@ -129,7 +129,7 @@ class TransactionController extends EventEmitter {
     }
   }
 
-/**
+  /**
   Adds a tx to the txlist
   @emits ${txMeta.id}:unapproved
 */
@@ -220,7 +220,7 @@ class TransactionController extends EventEmitter {
 
     return txMeta
   }
-/**
+  /**
   adds the tx gas defaults: gas && gasPrice
   @param txMeta {Object} - the txMeta object
   @returns {Promise<object>} resolves with txMeta
@@ -495,9 +495,9 @@ class TransactionController extends EventEmitter {
     this.txStateManager.updateTx(txMeta, 'transactions#setTxHash')
   }
 
-//
-//           PRIVATE METHODS
-//
+  //
+  //           PRIVATE METHODS
+  //
   /** maps methods for convenience*/
   _mapMethods () {
     /** @returns the state in transaction controller */
@@ -537,14 +537,14 @@ class TransactionController extends EventEmitter {
       loadingDefaults: true,
     }).forEach((tx) => {
       this.addTxGasDefaults(tx)
-      .then((txMeta) => {
-        txMeta.loadingDefaults = false
-        this.txStateManager.updateTx(txMeta, 'transactions: gas estimation for tx on boot')
-      }).catch((error) => {
-        tx.loadingDefaults = false
-        this.txStateManager.updateTx(tx, 'failed to estimate gas during boot cleanup.')
-        this.txStateManager.setTxStatusFailed(tx.id, error)
-      })
+        .then((txMeta) => {
+          txMeta.loadingDefaults = false
+          this.txStateManager.updateTx(txMeta, 'transactions: gas estimation for tx on boot')
+        }).catch((error) => {
+          tx.loadingDefaults = false
+          this.txStateManager.updateTx(tx, 'failed to estimate gas during boot cleanup.')
+          this.txStateManager.setTxStatusFailed(tx.id, error)
+        })
     })
 
     this.txStateManager.getFilteredTxList({

diff --git a/app/scripts/controllers/transactions/lib/tx-state-history-helper.js b/app/scripts/controllers/transactions/lib/tx-state-history-helper.js
@@ -17,10 +17,10 @@ function migrateFromSnapshotsToDiffs (longHistory) {
   return (
     longHistory
     // convert non-initial history entries into diffs
-    .map((entry, index) => {
-      if (index === 0) return entry
-      return generateHistoryEntry(longHistory[index - 1], entry)
-    })
+      .map((entry, index) => {
+        if (index === 0) return entry
+        return generateHistoryEntry(longHistory[index - 1], entry)
+      })
   )
 }
 

diff --git a/app/scripts/controllers/transactions/lib/util.js b/app/scripts/controllers/transactions/lib/util.js
@@ -26,7 +26,7 @@ const normalizers = {
   gasPrice: gasPrice => addHexPrefix(gasPrice),
 }
 
- /**
+/**
   normalizes txParams
   @param txParams {object}
   @returns {object} normalized txParams
@@ -40,7 +40,7 @@ function normalizeTxParams (txParams, LowerCase) {
   return normalizedTxParams
 }
 
- /**
+/**
   validates txParams
   @param txParams {object}
  */
@@ -59,7 +59,7 @@ function validateTxParams (txParams) {
   }
 }
 
- /**
+/**
   validates the from field in  txParams
   @param txParams {object}
  */
@@ -68,7 +68,7 @@ function validateFrom (txParams) {
   if (!isValidAddress(txParams.from)) throw new Error('Invalid from address')
 }
 
- /**
+/**
   validates the to field in  txParams
   @param txParams {object}
  */
@@ -85,7 +85,7 @@ function validateRecipient (txParams) {
   return txParams
 }
 
-  /**
+/**
     @returns an {array} of states that can be considered final
   */
 function getFinalStates () {

diff --git a/app/scripts/controllers/transactions/pending-tx-tracker.js b/app/scripts/controllers/transactions/pending-tx-tracker.js
@@ -186,7 +186,7 @@ class PendingTransactionTracker extends EventEmitter {
       this.emit('tx:warning', txMeta, err)
     }
   }
-    /**
+  /**
     checks to see if if the tx's nonce has been used by another transaction
     @param txMeta {Object} - txMeta object
     @emits tx:dropped
@@ -198,7 +198,7 @@ class PendingTransactionTracker extends EventEmitter {
     const nextNonce = await this.query.getTransactionCount(from)
     const { blockNumber } = await this.query.getTransactionByHash(hash) || {}
     if (!blockNumber && parseInt(nextNonce) > parseInt(nonce)) {
-        return true
+      return true
     }
     return false
   }

diff --git a/app/scripts/controllers/transactions/tx-state-manager.js b/app/scripts/controllers/transactions/tx-state-manager.js
@@ -34,7 +34,7 @@ class TransactionStateManager extends EventEmitter {
     this.store = new ObservableStore(
       extend({
         transactions: [],
-    }, initState))
+      }, initState))
     this.txHistoryLimit = txHistoryLimit
     this.getNetwork = getNetwork
   }
@@ -245,7 +245,7 @@ class TransactionStateManager extends EventEmitter {
     })
   }
 
-/**
+  /**
   @param opts {object} -  an object of fields to search for eg:<br>
   let <code>thingsToLookFor = {<br>
     to: '0x0..',<br>
@@ -403,9 +403,9 @@ class TransactionStateManager extends EventEmitter {
     // Update state
     this._saveTxList(otherAccountTxs)
   }
-//
-//           PRIVATE METHODS
-//
+  //
+  //           PRIVATE METHODS
+  //
 
   // STATUS METHODS
   // statuses:

diff --git a/app/scripts/edge-encryptor.js b/app/scripts/edge-encryptor.js
@@ -14,23 +14,23 @@ class EdgeEncryptor {
    * @returns {Promise<string>} Promise resolving to an object with ciphertext
    */
   encrypt (password, dataObject) {
-      var salt = this._generateSalt()
-      return this._keyFromPassword(password, salt)
-          .then(function (key) {
-              var data = JSON.stringify(dataObject)
-              var dataBuffer = Unibabel.utf8ToBuffer(data)
-              var vector = global.crypto.getRandomValues(new Uint8Array(16))
-              var resultbuffer = asmcrypto.AES_GCM.encrypt(dataBuffer, key, vector)
+    var salt = this._generateSalt()
+    return this._keyFromPassword(password, salt)
+      .then(function (key) {
+        var data = JSON.stringify(dataObject)
+        var dataBuffer = Unibabel.utf8ToBuffer(data)
+        var vector = global.crypto.getRandomValues(new Uint8Array(16))
+        var resultbuffer = asmcrypto.AES_GCM.encrypt(dataBuffer, key, vector)
 
-              var buffer = new Uint8Array(resultbuffer)
-              var vectorStr = Unibabel.bufferToBase64(vector)
-              var vaultStr = Unibabel.bufferToBase64(buffer)
-              return JSON.stringify({
-                  data: vaultStr,
-                  iv: vectorStr,
-                  salt: salt,
-              })
-          })
+        var buffer = new Uint8Array(resultbuffer)
+        var vectorStr = Unibabel.bufferToBase64(vector)
+        var vaultStr = Unibabel.bufferToBase64(buffer)
+        return JSON.stringify({
+          data: vaultStr,
+          iv: vectorStr,
+          salt: salt,
+        })
+      })
   }
 
   /**
@@ -41,25 +41,25 @@ class EdgeEncryptor {
    * @returns {Promise<Object>} Promise resolving to copy of decrypted object
    */
   decrypt (password, text) {
-      const payload = JSON.parse(text)
-      const salt = payload.salt
-      return this._keyFromPassword(password, salt)
-          .then(function (key) {
-              const encryptedData = Unibabel.base64ToBuffer(payload.data)
-              const vector = Unibabel.base64ToBuffer(payload.iv)
-              return new Promise((resolve, reject) => {
-                  var result
-                  try {
-                      result = asmcrypto.AES_GCM.decrypt(encryptedData, key, vector)
-                  } catch (err) {
-                      return reject(new Error('Incorrect password'))
-                  }
-                  const decryptedData = new Uint8Array(result)
-                  const decryptedStr = Unibabel.bufferToUtf8(decryptedData)
-                  const decryptedObj = JSON.parse(decryptedStr)
-                  resolve(decryptedObj)
-              })
-          })
+    const payload = JSON.parse(text)
+    const salt = payload.salt
+    return this._keyFromPassword(password, salt)
+      .then(function (key) {
+        const encryptedData = Unibabel.base64ToBuffer(payload.data)
+        const vector = Unibabel.base64ToBuffer(payload.iv)
+        return new Promise((resolve, reject) => {
+          var result
+          try {
+            result = asmcrypto.AES_GCM.decrypt(encryptedData, key, vector)
+          } catch (err) {
+            return reject(new Error('Incorrect password'))
+          }
+          const decryptedData = new Uint8Array(result)
+          const decryptedStr = Unibabel.bufferToUtf8(decryptedData)
+          const decryptedObj = JSON.parse(decryptedStr)
+          resolve(decryptedObj)
+        })
+      })
   }
 
   /**
@@ -72,14 +72,14 @@ class EdgeEncryptor {
    */
   _keyFromPassword (password, salt) {
 
-      var passBuffer = Unibabel.utf8ToBuffer(password)
-      var saltBuffer = Unibabel.base64ToBuffer(salt)
-      const iterations = 10000
-      const length = 32 // SHA256 hash size
-      return new Promise((resolve) => {
-          var key = asmcrypto.Pbkdf2HmacSha256(passBuffer, saltBuffer, iterations, length)
-          resolve(key)
-      })
+    var passBuffer = Unibabel.utf8ToBuffer(password)
+    var saltBuffer = Unibabel.base64ToBuffer(salt)
+    const iterations = 10000
+    const length = 32 // SHA256 hash size
+    return new Promise((resolve) => {
+      var key = asmcrypto.Pbkdf2HmacSha256(passBuffer, saltBuffer, iterations, length)
+      resolve(key)
+    })
   }
 
   /**
@@ -89,10 +89,10 @@ class EdgeEncryptor {
    * @returns {string} Randomized base64 encoded data
    */
   _generateSalt (byteCount = 32) {
-      var view = new Uint8Array(byteCount)
-      global.crypto.getRandomValues(view)
-      var b64encoded = btoa(String.fromCharCode.apply(null, view))
-      return b64encoded
+    var view = new Uint8Array(byteCount)
+    global.crypto.getRandomValues(view)
+    var b64encoded = btoa(String.fromCharCode.apply(null, view))
+    return b64encoded
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,7 @@ class DetectTokensController { @@
         })
       }
-       /**
+      /**
        * Find if selectedAddress has tokens with contract in contractAddress.
        *
        * @param {string} contractAddress Hex address of the token contract to explore.
@@ Expand Down @@