From 573fd7ba6a4ad12cd878986718e84d9eb8a9c635 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Tue, 10 Nov 2020 18:41:27 +0100
Subject: [PATCH] keyringOption expose

---
 packages/ui-keyring/src/Keyring.ts            | 6 ++----
 packages/ui-keyring/src/options/index.spec.ts | 8 +++-----
 packages/ui-keyring/src/options/index.ts      | 4 ++++
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/ui-keyring/src/Keyring.ts b/packages/ui-keyring/src/Keyring.ts
index 050d4ca4..5ff1e7c1 100644
--- a/packages/ui-keyring/src/Keyring.ts
+++ b/packages/ui-keyring/src/Keyring.ts
@@ -15,7 +15,7 @@ import { base64Decode, createKeyMulti } from '@polkadot/util-crypto';
 import env from './observable/development';
 import Base from './Base';
 import { accountKey, addressKey, accountRegex, addressRegex, contractKey, contractRegex } from './defaults';
-import { KeyringOption } from './options';
+import keyringOption from './options';
 
 const RECENT_EXPIRY = 24 * 60 * 60;
 
@@ -23,8 +23,6 @@ const RECENT_EXPIRY = 24 * 60 * 60;
 // Chain determination occurs outside of Keyring. Loading `keyring.loadAll({ type: 'ed25519' | 'sr25519' })` is triggered
 // from the API after the chain is received
 export class Keyring extends Base implements KeyringStruct {
-  #keyringOption = new KeyringOption();
-
   #stores = {
     account: (): AddressSubject => this.accounts,
     address: (): AddressSubject => this.addresses,
@@ -279,7 +277,7 @@ export class Keyring extends Base implements KeyringStruct {
       }
     });
 
-    this.#keyringOption.init(this);
+    keyringOption.init(this);
   }
 
   public restoreAccount (json: KeyringPair$Json, password: string): KeyringPair {
diff --git a/packages/ui-keyring/src/options/index.spec.ts b/packages/ui-keyring/src/options/index.spec.ts
index ed124378..64cbffc1 100644
--- a/packages/ui-keyring/src/options/index.spec.ts
+++ b/packages/ui-keyring/src/options/index.spec.ts
@@ -2,20 +2,18 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { KeyringStruct } from '../types';
-import { KeyringOption } from '.';
-
-const keyringOptionInstance = new KeyringOption();
+import keyringOption from '.';
 
 describe('KeyringOption', (): void => {
   it('should not allow initOptions to be called more than once', (): void => {
     const state: Partial<KeyringStruct> = {};
 
     // first call
-    keyringOptionInstance.init(state as KeyringStruct);
+    keyringOption.init(state as KeyringStruct);
 
     // second call
     expect((): void => {
-      keyringOptionInstance.init(state as KeyringStruct);
+      keyringOption.init(state as KeyringStruct);
     }).toThrowError('Unable to initialise options more than once');
   });
 });
diff --git a/packages/ui-keyring/src/options/index.ts b/packages/ui-keyring/src/options/index.ts
index 826614df..5db50212 100644
--- a/packages/ui-keyring/src/options/index.ts
+++ b/packages/ui-keyring/src/options/index.ts
@@ -138,3 +138,7 @@ export class KeyringOption implements KeyringOptionInstance {
     };
   }
 }
+
+const keyringOption = new KeyringOption();
+
+export default keyringOption;