small change

Author: fan-zhang-sv

packages/client/src/EIP1193Provider.test.ts

@@ -23,6 +23,7 @@ describe('EIP1193Provider', () => {
   beforeEach(() => {
     mockWallet = Wallets.CoinbaseSmartWallet;
     mockClient = {
+      handshake: jest.fn(),
       request: jest.fn(),
       reset: jest.fn(),
     } as unknown as jest.Mocked<MWPClient>;

packages/client/src/MWPClient.test.ts

@@ -1,6 +1,6 @@
 import { WebBasedWalletCommunicator } from 'src/components/communicator/webBased/Communicator';
 
-import { Communicator, CommunicatorInterface } from './components/communicator';
+import { CommunicatorInterface, getCommunicator } from './components/communicator';
 import { KeyManager } from './components/key/KeyManager';
 import { MWPClient } from './MWPClient';
 import {
@@ -68,7 +68,7 @@ describe('MWPClient', () => {
     };
 
     WebBasedWalletCommunicator.communicators.clear();
-    mockCommunicator = Communicator.getInstance(mockWallet);
+    mockCommunicator = getCommunicator(mockWallet);
     jest
       .spyOn(mockCommunicator, 'postRequestAndWaitForResponse')
       .mockResolvedValue(mockSuccessResponse);

packages/client/src/MWPClient.ts

@@ -16,7 +16,7 @@ const ACCOUNTS_KEY = 'accounts';
 const ACTIVE_CHAIN_STORAGE_KEY = 'activeChain';
 const AVAILABLE_CHAINS_STORAGE_KEY = 'availableChains';
 const WALLET_CAPABILITIES_STORAGE_KEY = 'walletCapabilities';
-import { Communicator, CommunicatorInterface } from './components/communicator';
+import { CommunicatorInterface, getCommunicator } from './components/communicator';
 import { LIB_VERSION } from './version';
 import {
   appendMWPResponsePath,
@@ -57,7 +57,7 @@ export class MWPClient {
     this.keyManager = new KeyManager({ wallet: this.wallet });
     this.storage = new ScopedAsyncStorage(this.wallet.name, 'MWPClient');
 
-    this.communicator = Communicator.getInstance(this.wallet);
+    this.communicator = getCommunicator(this.wallet);
 
     // default values
     this.accounts = [];

…onents/communicator/Communicator.test.ts …nts/communicator/getCommunicator.test.tspackages/client/src/components/communicator/Communicator.test.ts renamed to packages/client/src/components/communicator/getCommunicator.test.ts packages/client/src/components/communicator/Communicator.test.ts renamed to packages/client/src/components/communicator/getCommunicator.test.ts

@@ -1,4 +1,4 @@
-import { Communicator } from './Communicator';
+import { getCommunicator } from './getCommunicator';
 import { WebBasedWalletCommunicator } from './webBased/Communicator';
 import { Wallet } from ':core/wallet';
 
@@ -25,7 +25,7 @@ describe('Communicator', () => {
     };
     (WebBasedWalletCommunicator.getInstance as jest.Mock).mockReturnValue(mockCommunicator);
 
-    const result = Communicator.getInstance(mockWebBasedWallet);
+    const result = getCommunicator(mockWebBasedWallet);
 
     expect(WebBasedWalletCommunicator.getInstance).toHaveBeenCalledWith('test-scheme://');
     expect(result).toBe(mockCommunicator);
@@ -34,9 +34,7 @@ describe('Communicator', () => {
   test('getInstance throws error for native wallet', () => {
     const mockNativeWallet: Wallet = { type: 'native', scheme: 'native-scheme://' } as Wallet;
 
-    expect(() => Communicator.getInstance(mockNativeWallet)).toThrow(
-      'Native wallet not supported yet'
-    );
+    expect(() => getCommunicator(mockNativeWallet)).toThrow('Native wallet not supported yet');
   });
 
   test('getInstance throws error for unsupported wallet type', () => {
@@ -45,8 +43,6 @@ describe('Communicator', () => {
       scheme: 'unsupported-scheme://',
     } as Wallet;
 
-    expect(() => Communicator.getInstance(mockUnsupportedWallet)).toThrow(
-      'Unsupported wallet type'
-    );
+    expect(() => getCommunicator(mockUnsupportedWallet)).toThrow('Unsupported wallet type');
   });
 });

…/components/communicator/Communicator.ts …mponents/communicator/getCommunicator.tspackages/client/src/components/communicator/Communicator.ts renamed to packages/client/src/components/communicator/getCommunicator.ts packages/client/src/components/communicator/Communicator.ts renamed to packages/client/src/components/communicator/getCommunicator.ts

@@ -7,18 +7,16 @@ export interface CommunicatorInterface {
   handleResponse: (responseUrl: string) => boolean;
 }
 
-export class Communicator {
-  static getInstance(wallet: Wallet): CommunicatorInterface {
-    const { type, scheme } = wallet;
+export function getCommunicator(wallet: Wallet): CommunicatorInterface {
+  const { type, scheme } = wallet;
 
-    if (type === 'webBased') {
-      return WebBasedWalletCommunicator.getInstance(scheme);
-    }
-
-    if (type === 'native') {
-      throw new Error('Native wallet not supported yet');
-    }
+  if (type === 'webBased') {
+    return WebBasedWalletCommunicator.getInstance(scheme);
+  }
 
-    throw new Error('Unsupported wallet type');
+  if (type === 'native') {
+    throw new Error('Native wallet not supported yet');
   }
+
+  throw new Error('Unsupported wallet type');
 }

packages/client/src/components/communicator/index.ts

@@ -1,2 +1,2 @@
-export * from './Communicator';
+export * from './getCommunicator';
 export * from './handleResponse';

packages/client/src/components/communicator/webBased/Communicator.ts

@@ -1,6 +1,6 @@
 import * as WebBrowser from 'expo-web-browser';
 
-import { CommunicatorInterface } from '../Communicator';
+import { CommunicatorInterface } from '../getCommunicator';
 import { HashedContent } from './types';
 import { standardErrors } from ':core/error';
 import { MessageID, RPCRequestMessage, RPCResponseMessage } from ':core/message';