Improve Keyring organization

Separated public & private methods. (Fixes #845)
Made class method `type()` into a simple property. (Fixes #846)

1 files changed, 2 insertions, 2 deletions

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index cf761c88c..fdef9d7b3 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -67,7 +67,7 @@ module.exports = class KeyringController extends EventEmitter {
       currentFiat: this.configManager.getCurrentFiat(),
       conversionRate: this.configManager.getConversionRate(),
       conversionDate: this.configManager.getConversionDate(),
-      keyringTypes: this.keyringTypes.map((krt) => krt.type()),
+      keyringTypes: this.keyringTypes.map(krt => krt.type),
       identities: this.identities,
     }
   }
@@ -312,7 +312,7 @@ module.exports = class KeyringController extends EventEmitter {
 
   getKeyringClassForType (type) {
     const Keyring = this.keyringTypes.reduce((res, kr) => {
-      if (kr.type() === type) {
+      if (kr.type === type) {
         return kr
       } else {
         return res