Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add new type in api - settings in order to support different types of… #476

Merged
merged 9 commits into from
Jun 15, 2021
5 changes: 3 additions & 2 deletions packages/ui-settings/src/Settings.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
// Copyright 2017-2021 @polkadot/ui-settings authors & contributors
// SPDX-License-Identifier: Apache-2.0

import type { Endpoint, EndpointType, Option, SettingsStruct } from './types';

import EventEmitter from 'eventemitter3';
import store from 'store';

import { isUndefined } from '@polkadot/util';

import { CAMERA, CAMERA_DEFAULT, CRYPTOS, CRYPTOS_ETH, CRYPTOS_LEDGER, ENDPOINT_DEFAULT, ENDPOINTS, ICON_DEFAULT, ICONS, LANGUAGE_DEFAULT, LEDGER_CONN, LEDGER_CONN_DEFAULT, LOCKING, LOCKING_DEFAULT, PREFIX_DEFAULT, PREFIXES, UIMODE_DEFAULT, UIMODES, UITHEME_DEFAULT, UITHEMES } from './defaults';
import { Endpoint, EndpointType, Option, SettingsStruct } from './types';

type ChangeCallback = (settings: SettingsStruct) => void;
type OnTypes = 'change';
Expand Down Expand Up @@ -51,7 +52,7 @@ export class Settings implements SettingsStruct {

// will become deprecated for supporting substrate connect light clients. apiType structure should be used instead
this.#apiUrl = (typeof settings.apiUrl === 'string' && settings.apiUrl) || process.env.WS_URL || (ENDPOINT_DEFAULT.value as string);
this.#apiType = { type: EndpointType.jrpc, url: this.#apiUrl };
this.#apiType = { type: 'json-rpc' as EndpointType, url: this.#apiUrl };
this.#camera = withDefault(CAMERA, settings.camera, CAMERA_DEFAULT);
this.#ledgerConn = withDefault(LEDGER_CONN, settings.ledgerConn, LEDGER_CONN_DEFAULT);
this.#i18nLang = settings.i18nLang || LANGUAGE_DEFAULT;
Expand Down
3 changes: 1 addition & 2 deletions packages/ui-settings/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
// SPDX-License-Identifier: Apache-2.0

import { Settings, settings } from './Settings';
import { Endpoint, EndpointType, JsonRpcEndpoint, SubstrateConnectEndpoint } from './types';

export { ENDPOINT_DEFAULT, ICON_DEFAULT, ICON_DEFAULT_HOST, LANGUAGE_DEFAULT, LOCKING_DEFAULT, PREFIX_DEFAULT, UIMODE_DEFAULT, UITHEME_DEFAULT } from './defaults';
export { packageInfo } from './packageInfo';

export { settings, Settings, Endpoint, JsonRpcEndpoint, SubstrateConnectEndpoint, EndpointType };
export { settings, Settings };

export default settings;
17 changes: 4 additions & 13 deletions packages/ui-settings/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,9 @@ export interface NetworkSpecsStruct {
unit: string;
}

export type Endpoint = JsonRpcEndpoint | SubstrateConnectEndpoint;
export interface JsonRpcEndpoint {
type: EndpointType.jrpc;
url: string;
export type Endpoint = {
type: EndpointType;
param: string;
wirednkod marked this conversation as resolved.
Show resolved Hide resolved
}

export interface SubstrateConnectEndpoint {
type: EndpointType.substrateconnect;
chain: string;
}

export enum EndpointType {
jrpc = 'json-rpc',
substrateconnect = 'substrate-connect'
}
export type EndpointType = 'json-rpc' | 'substrate-connect';