From db6b9c80c35ce483220d613c7e9932ebd18d9a85 Mon Sep 17 00:00:00 2001 From: Jaco Date: Tue, 26 Jul 2022 17:15:55 +0200 Subject: [PATCH] Remove pre-cjs connect mock (#7911) * Remove per-cjs connect mock * Adjust --- jest/setupEnv.cjs | 1 - jest/substrate-connect.ts | 114 ------------------ .../react-api/__mocks__/@substrate/connect.js | 4 - 3 files changed, 119 deletions(-) delete mode 100644 jest/substrate-connect.ts delete mode 100644 packages/react-api/__mocks__/@substrate/connect.js diff --git a/jest/setupEnv.cjs b/jest/setupEnv.cjs index 21ceb584a9..cbd1c94dd7 100644 --- a/jest/setupEnv.cjs +++ b/jest/setupEnv.cjs @@ -2,7 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 require('@testing-library/jest-dom'); -require('./substrate-connect'); const nodeCrypto = require('crypto'); const { configure } = require('@testing-library/dom'); diff --git a/jest/substrate-connect.ts b/jest/substrate-connect.ts deleted file mode 100644 index 7fd8fe92b3..0000000000 --- a/jest/substrate-connect.ts +++ /dev/null @@ -1,114 +0,0 @@ -// Copyright 2017-2022 @polkadot/apps authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// duplicated from https://github.com/polkadot-js/api/blob/bb75b422730d6bf5189a87e9b7bbd1585bd5cd26/packages/rpc-provider/src/substrate-connect/ScProvider.spec.ts#L1 - -import type { Chain, JsonRpcCallback } from '@substrate/connect'; - -type MockChain = Chain & { - _spec: () => string - _recevedRequests: () => string[] - _isTerminated: () => boolean - _triggerCallback: (response: string | {}) => void - _setTerminateInterceptor: (fn: () => void) => void - _setSendJsonRpcInterceptor: (fn: (rpc: string) => void) => void - _getLatestRequest: () => string -} - -const getFakeChain = (spec: string, callback: JsonRpcCallback): MockChain => { - const _receivedRequests: string[] = []; - let _isTerminated = false; - - let terminateInterceptor: Function = Function.prototype; - let sendJsonRpcInterceptor: Function = Function.prototype; - - return { - _spec: () => spec, - _recevedRequests: () => _receivedRequests, - _isTerminated: () => _isTerminated, - _triggerCallback: (response) => { - callback( - typeof response === 'string' ? response : JSON.stringify(response) - ); - }, - _setSendJsonRpcInterceptor: (fn) => { - sendJsonRpcInterceptor = fn; - }, - _setTerminateInterceptor: (fn) => { - terminateInterceptor = fn; - }, - sendJsonRpc: (rpc) => { - sendJsonRpcInterceptor(rpc); - _receivedRequests.push(rpc); - }, - remove: () => { - terminateInterceptor(); - _isTerminated = true; - }, - _getLatestRequest: () => _receivedRequests[_receivedRequests.length - 1] - }; -}; - -const getFakeClient = () => { - const chains: MockChain[] = []; - let addChainInterceptor: Promise = Promise.resolve(); - let addWellKnownChainInterceptor: Promise = Promise.resolve(); - - return { - _chains: () => chains, - _setAddChainInterceptor: (interceptor: Promise) => { - addChainInterceptor = interceptor; - }, - _setAddWellKnownChainInterceptor: (interceptor: Promise) => { - addWellKnownChainInterceptor = interceptor; - }, - addChain: (chainSpec: string, cb: JsonRpcCallback): Promise => - addChainInterceptor.then(() => { - const result = getFakeChain(chainSpec, cb); - - chains.push(result); - - return result; - }), - addWellKnownChain: ( - wellKnownChain: string, - cb: JsonRpcCallback - ): Promise => - addWellKnownChainInterceptor.then(() => { - const result = getFakeChain(wellKnownChain, cb); - - chains.push(result); - - return result; - }) - }; -}; - -enum WellKnownChain { - polkadot = 'polkadot', - ksmcc3 = 'ksmcc3', - rococo_v2_1 = 'rococo_v2_1', - westend2 = 'westend2' -} - -const connectorFactory = () => { - const clients: ReturnType[] = []; - const latestClient = () => clients[clients.length - 1]; - - return { - WellKnownChain, - createScClient: () => { - const result = getFakeClient(); - - clients.push(result); - - return result; - }, - _clients: () => clients, - latestClient, - latestChain: () => - latestClient()._chains()[latestClient()._chains().length - 1] - }; -}; - -jest.mock('@substrate/connect', () => connectorFactory()); diff --git a/packages/react-api/__mocks__/@substrate/connect.js b/packages/react-api/__mocks__/@substrate/connect.js deleted file mode 100644 index b96a25bc4e..0000000000 --- a/packages/react-api/__mocks__/@substrate/connect.js +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2017-2022 @polkadot/react-api authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -module.exports = '';