diff --git a/apps/governance/src/routes/proposals/components/current-proposal-status/current-proposal-status.spec.tsx b/apps/governance/src/routes/proposals/components/current-proposal-status/current-proposal-status.spec.tsx index 3841d760d..719b910ca 100644 --- a/apps/governance/src/routes/proposals/components/current-proposal-status/current-proposal-status.spec.tsx +++ b/apps/governance/src/routes/proposals/components/current-proposal-status/current-proposal-status.spec.tsx @@ -2,8 +2,8 @@ import type { MockedResponse } from '@apollo/client/testing'; import { MockedProvider } from '@apollo/client/testing'; import { render, screen } from '@testing-library/react'; import { ProposalRejectionReason, ProposalState } from '@vegaprotocol/types'; -import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers'; -import { NetworkParamsDocument } from '@vegaprotocol/react-helpers'; +import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters'; +import { NetworkParamsDocument } from '@vegaprotocol/network-parameters'; import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider'; import { generateProposal } from '../../test-helpers/generate-proposals'; import { CurrentProposalStatus } from './current-proposal-status'; diff --git a/apps/governance/src/routes/proposals/components/proposal/proposal.spec.tsx b/apps/governance/src/routes/proposals/components/proposal/proposal.spec.tsx index 70c8da410..95d20400d 100644 --- a/apps/governance/src/routes/proposals/components/proposal/proposal.spec.tsx +++ b/apps/governance/src/routes/proposals/components/proposal/proposal.spec.tsx @@ -3,8 +3,8 @@ import { generateProposal } from '../../test-helpers/generate-proposals'; import { Proposal } from './proposal'; import type { ProposalQuery } from '../../proposal/__generated__/Proposal'; -jest.mock('@vegaprotocol/react-helpers', () => ({ - ...jest.requireActual('@vegaprotocol/react-helpers'), +jest.mock('@vegaprotocol/network-parameters', () => ({ + ...jest.requireActual('@vegaprotocol/network-parameters'), useNetworkParams: jest.fn(() => ({ params: { governance_proposal_asset_minVoterBalance: '1', diff --git a/apps/governance/src/routes/proposals/components/proposal/proposal.tsx b/apps/governance/src/routes/proposals/components/proposal/proposal.tsx index 2559ea11d..f96001b91 100644 --- a/apps/governance/src/routes/proposals/components/proposal/proposal.tsx +++ b/apps/governance/src/routes/proposals/components/proposal/proposal.tsx @@ -1,4 +1,7 @@ -import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers'; +import { + NetworkParams, + useNetworkParams, +} from '@vegaprotocol/network-parameters'; import { AsyncRenderer } from '@vegaprotocol/ui-toolkit'; import { ProposalHeader } from '../proposal-detail-header/proposal-header'; import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals'; diff --git a/apps/governance/src/routes/proposals/hooks/use-proposal-network-params.spec.ts b/apps/governance/src/routes/proposals/hooks/use-proposal-network-params.spec.ts index 627a16c92..ff3e1da21 100644 --- a/apps/governance/src/routes/proposals/hooks/use-proposal-network-params.spec.ts +++ b/apps/governance/src/routes/proposals/hooks/use-proposal-network-params.spec.ts @@ -3,8 +3,8 @@ import { BigNumber } from '../../../lib/bignumber'; import { useProposalNetworkParams } from './use-proposal-network-params'; import { generateProposal } from '../test-helpers/generate-proposals'; -jest.mock('@vegaprotocol/react-helpers', () => ({ - ...jest.requireActual('@vegaprotocol/react-helpers'), +jest.mock('@vegaprotocol/network-parameters', () => ({ + ...jest.requireActual('@vegaprotocol/network-parameters'), useNetworkParams: jest.fn(() => ({ params: { governance_proposal_updateMarket_requiredMajority: '0.1', diff --git a/apps/governance/src/routes/proposals/hooks/use-proposal-network-params.ts b/apps/governance/src/routes/proposals/hooks/use-proposal-network-params.ts index cdeb7d78f..1b84b688d 100644 --- a/apps/governance/src/routes/proposals/hooks/use-proposal-network-params.ts +++ b/apps/governance/src/routes/proposals/hooks/use-proposal-network-params.ts @@ -1,4 +1,7 @@ -import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers'; +import { + NetworkParams, + useNetworkParams, +} from '@vegaprotocol/network-parameters'; import { BigNumber } from '../../../lib/bignumber'; import type { ProposalFieldsFragment } from '../proposals/__generated__/Proposals'; import type { ProposalQuery } from '../proposal/__generated__/Proposal'; diff --git a/apps/governance/src/routes/proposals/hooks/use-vote-information.spec.ts b/apps/governance/src/routes/proposals/hooks/use-vote-information.spec.ts index c79bc73fc..95392e14c 100644 --- a/apps/governance/src/routes/proposals/hooks/use-vote-information.spec.ts +++ b/apps/governance/src/routes/proposals/hooks/use-vote-information.spec.ts @@ -28,8 +28,8 @@ jest.mock('../../../contexts/app-state/app-state-context', () => ({ }), })); -jest.mock('@vegaprotocol/react-helpers', () => ({ - ...jest.requireActual('@vegaprotocol/react-helpers'), +jest.mock('@vegaprotocol/network-parameters', () => ({ + ...jest.requireActual('@vegaprotocol/network-parameters'), useNetworkParams: jest.fn(() => ({ params: { governance_proposal_updateMarket_requiredMajority: '0.5', diff --git a/apps/governance/src/routes/proposals/propose/freeform/propose-freeform.spec.tsx b/apps/governance/src/routes/proposals/propose/freeform/propose-freeform.spec.tsx index 530404033..4f206e056 100644 --- a/apps/governance/src/routes/proposals/propose/freeform/propose-freeform.spec.tsx +++ b/apps/governance/src/routes/proposals/propose/freeform/propose-freeform.spec.tsx @@ -5,9 +5,9 @@ import { mockWalletContext } from '../../test-helpers/mocks'; import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider'; import { VegaWalletContext } from '@vegaprotocol/wallet'; import { MemoryRouter as Router } from 'react-router-dom'; -import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers'; +import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters'; import type { MockedResponse } from '@apollo/client/testing'; -import { NetworkParamsDocument } from '@vegaprotocol/react-helpers'; +import { NetworkParamsDocument } from '@vegaprotocol/network-parameters'; jest.mock('@vegaprotocol/environment', () => ({ useEnvironment: () => ({ diff --git a/apps/governance/src/routes/proposals/propose/freeform/propose-freeform.tsx b/apps/governance/src/routes/proposals/propose/freeform/propose-freeform.tsx index 18f837d06..7e4574746 100644 --- a/apps/governance/src/routes/proposals/propose/freeform/propose-freeform.tsx +++ b/apps/governance/src/routes/proposals/propose/freeform/propose-freeform.tsx @@ -19,7 +19,10 @@ import { ProposalMinRequirements } from '../../components/shared'; import { AsyncRenderer, ExternalLink } from '@vegaprotocol/ui-toolkit'; import { Heading } from '../../../../components/heading'; import { createDocsLinks } from '@vegaprotocol/utils'; -import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers'; +import { + NetworkParams, + useNetworkParams, +} from '@vegaprotocol/network-parameters'; import { ProposalUserAction } from '../../components/shared'; import { downloadJson } from '../../../../lib/download-json'; diff --git a/apps/governance/src/routes/proposals/propose/network-parameter/propose-network-parameter.spec.tsx b/apps/governance/src/routes/proposals/propose/network-parameter/propose-network-parameter.spec.tsx index 2afe71cd6..39b0f18a8 100644 --- a/apps/governance/src/routes/proposals/propose/network-parameter/propose-network-parameter.spec.tsx +++ b/apps/governance/src/routes/proposals/propose/network-parameter/propose-network-parameter.spec.tsx @@ -5,8 +5,8 @@ import { mockWalletContext } from '../../test-helpers/mocks'; import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider'; import { VegaWalletContext } from '@vegaprotocol/wallet'; import { MemoryRouter as Router } from 'react-router-dom'; -import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers'; -import { NetworkParamsDocument } from '@vegaprotocol/react-helpers'; +import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters'; +import { NetworkParamsDocument } from '@vegaprotocol/network-parameters'; import type { MockedResponse } from '@apollo/client/testing'; jest.mock('@vegaprotocol/environment', () => ({ diff --git a/apps/governance/src/routes/proposals/propose/network-parameter/propose-network-parameter.tsx b/apps/governance/src/routes/proposals/propose/network-parameter/propose-network-parameter.tsx index eaa57e9ba..b13a47085 100644 --- a/apps/governance/src/routes/proposals/propose/network-parameter/propose-network-parameter.tsx +++ b/apps/governance/src/routes/proposals/propose/network-parameter/propose-network-parameter.tsx @@ -5,7 +5,7 @@ import { createDocsLinks, suitableForSyntaxHighlighter, } from '@vegaprotocol/utils'; -import { useNetworkParams } from '@vegaprotocol/react-helpers'; +import { useNetworkParams } from '@vegaprotocol/network-parameters'; import { getClosingTimestamp, getEnactmentTimestamp, diff --git a/apps/governance/src/routes/proposals/propose/new-asset/propose-new-asset.spec.tsx b/apps/governance/src/routes/proposals/propose/new-asset/propose-new-asset.spec.tsx index d82474862..567891b8c 100644 --- a/apps/governance/src/routes/proposals/propose/new-asset/propose-new-asset.spec.tsx +++ b/apps/governance/src/routes/proposals/propose/new-asset/propose-new-asset.spec.tsx @@ -5,9 +5,9 @@ import { VegaWalletContext } from '@vegaprotocol/wallet'; import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider'; import { mockWalletContext } from '../../test-helpers/mocks'; import { ProposeNewAsset } from './propose-new-asset'; -import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers'; +import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters'; import type { MockedResponse } from '@apollo/client/testing'; -import { NetworkParamsDocument } from '@vegaprotocol/react-helpers'; +import { NetworkParamsDocument } from '@vegaprotocol/network-parameters'; jest.mock('@vegaprotocol/environment', () => ({ useEnvironment: () => ({ diff --git a/apps/governance/src/routes/proposals/propose/new-asset/propose-new-asset.tsx b/apps/governance/src/routes/proposals/propose/new-asset/propose-new-asset.tsx index 77bde4964..cf621bf2d 100644 --- a/apps/governance/src/routes/proposals/propose/new-asset/propose-new-asset.tsx +++ b/apps/governance/src/routes/proposals/propose/new-asset/propose-new-asset.tsx @@ -9,7 +9,10 @@ import { } from '@vegaprotocol/proposals'; import { useEnvironment } from '@vegaprotocol/environment'; import { createDocsLinks, validateJson } from '@vegaprotocol/utils'; -import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers'; +import { + NetworkParams, + useNetworkParams, +} from '@vegaprotocol/network-parameters'; import { ProposalFormDescription, ProposalFormSubheader, diff --git a/apps/governance/src/routes/proposals/propose/new-market/propose-new-market.spec.tsx b/apps/governance/src/routes/proposals/propose/new-market/propose-new-market.spec.tsx index 1c0cd6f03..8210fe010 100644 --- a/apps/governance/src/routes/proposals/propose/new-market/propose-new-market.spec.tsx +++ b/apps/governance/src/routes/proposals/propose/new-market/propose-new-market.spec.tsx @@ -6,8 +6,8 @@ import { AppStateProvider } from '../../../../contexts/app-state/app-state-provi import { VegaWalletContext } from '@vegaprotocol/wallet'; import { BrowserRouter as Router } from 'react-router-dom'; import type { MockedResponse } from '@apollo/client/testing'; -import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers'; -import { NetworkParamsDocument } from '@vegaprotocol/react-helpers'; +import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters'; +import { NetworkParamsDocument } from '@vegaprotocol/network-parameters'; jest.mock('@vegaprotocol/environment', () => ({ useEnvironment: () => ({ diff --git a/apps/governance/src/routes/proposals/propose/new-market/propose-new-market.tsx b/apps/governance/src/routes/proposals/propose/new-market/propose-new-market.tsx index d67f75f36..013c444ca 100644 --- a/apps/governance/src/routes/proposals/propose/new-market/propose-new-market.tsx +++ b/apps/governance/src/routes/proposals/propose/new-market/propose-new-market.tsx @@ -8,7 +8,10 @@ import { } from '@vegaprotocol/proposals'; import { useEnvironment } from '@vegaprotocol/environment'; import { createDocsLinks, validateJson } from '@vegaprotocol/utils'; -import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers'; +import { + NetworkParams, + useNetworkParams, +} from '@vegaprotocol/network-parameters'; import { ProposalFormDescription, ProposalFormSubheader, diff --git a/apps/governance/src/routes/proposals/propose/raw/proposal-raw.spec.tsx b/apps/governance/src/routes/proposals/propose/raw/proposal-raw.spec.tsx index 4e6e7d026..f9b65c8ca 100644 --- a/apps/governance/src/routes/proposals/propose/raw/proposal-raw.spec.tsx +++ b/apps/governance/src/routes/proposals/propose/raw/proposal-raw.spec.tsx @@ -10,8 +10,8 @@ import { ProposeRaw } from './propose-raw'; import { ProposalEventDocument } from '@vegaprotocol/proposals'; import type { ProposalEventSubscription } from '@vegaprotocol/proposals'; -import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers'; -import { NetworkParamsDocument } from '@vegaprotocol/react-helpers'; +import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters'; +import { NetworkParamsDocument } from '@vegaprotocol/network-parameters'; const paramsDelay = 20; diff --git a/apps/governance/src/routes/proposals/propose/raw/propose-raw.tsx b/apps/governance/src/routes/proposals/propose/raw/propose-raw.tsx index 9485ccb84..7b0fd7004 100644 --- a/apps/governance/src/routes/proposals/propose/raw/propose-raw.tsx +++ b/apps/governance/src/routes/proposals/propose/raw/propose-raw.tsx @@ -10,7 +10,10 @@ import { TextArea, } from '@vegaprotocol/ui-toolkit'; import { createDocsLinks, validateJson } from '@vegaprotocol/utils'; -import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers'; +import { + NetworkParams, + useNetworkParams, +} from '@vegaprotocol/network-parameters'; import { useProposalSubmit } from '@vegaprotocol/proposals'; import { ProposalFormSubmit, diff --git a/apps/governance/src/routes/proposals/propose/update-asset/propose-update-asset.spec.tsx b/apps/governance/src/routes/proposals/propose/update-asset/propose-update-asset.spec.tsx index cd86a9994..922847350 100644 --- a/apps/governance/src/routes/proposals/propose/update-asset/propose-update-asset.spec.tsx +++ b/apps/governance/src/routes/proposals/propose/update-asset/propose-update-asset.spec.tsx @@ -5,9 +5,9 @@ import { VegaWalletContext } from '@vegaprotocol/wallet'; import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider'; import { mockWalletContext } from '../../test-helpers/mocks'; import { ProposeUpdateAsset } from './propose-update-asset'; -import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers'; +import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters'; import type { MockedResponse } from '@apollo/client/testing'; -import { NetworkParamsDocument } from '@vegaprotocol/react-helpers'; +import { NetworkParamsDocument } from '@vegaprotocol/network-parameters'; jest.mock('@vegaprotocol/environment', () => ({ useEnvironment: () => ({ diff --git a/apps/governance/src/routes/proposals/propose/update-asset/propose-update-asset.tsx b/apps/governance/src/routes/proposals/propose/update-asset/propose-update-asset.tsx index e6a825e45..0bbed4234 100644 --- a/apps/governance/src/routes/proposals/propose/update-asset/propose-update-asset.tsx +++ b/apps/governance/src/routes/proposals/propose/update-asset/propose-update-asset.tsx @@ -8,7 +8,10 @@ import { } from '@vegaprotocol/proposals'; import { useEnvironment } from '@vegaprotocol/environment'; import { createDocsLinks, validateJson } from '@vegaprotocol/utils'; -import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers'; +import { + NetworkParams, + useNetworkParams, +} from '@vegaprotocol/network-parameters'; import { ProposalFormDescription, ProposalFormSubheader, diff --git a/apps/governance/src/routes/proposals/propose/update-market/propose-update-market.spec.tsx b/apps/governance/src/routes/proposals/propose/update-market/propose-update-market.spec.tsx index 23506cc0f..2749544b5 100644 --- a/apps/governance/src/routes/proposals/propose/update-market/propose-update-market.spec.tsx +++ b/apps/governance/src/routes/proposals/propose/update-market/propose-update-market.spec.tsx @@ -6,8 +6,8 @@ import { VegaWalletContext } from '@vegaprotocol/wallet'; import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider'; import { mockWalletContext } from '../../test-helpers/mocks'; import { ProposeUpdateMarket } from './propose-update-market'; -import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers'; -import { NetworkParamsDocument } from '@vegaprotocol/react-helpers'; +import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters'; +import { NetworkParamsDocument } from '@vegaprotocol/network-parameters'; import type { ProposalMarketsQueryQuery } from './__generated__/UpdateMarket'; import { ProposalMarketsQueryDocument } from './__generated__/UpdateMarket'; import { ProposalState } from '@vegaprotocol/types'; diff --git a/apps/governance/src/routes/proposals/propose/update-market/propose-update-market.tsx b/apps/governance/src/routes/proposals/propose/update-market/propose-update-market.tsx index 08732f8fb..4d1bbd1b8 100644 --- a/apps/governance/src/routes/proposals/propose/update-market/propose-update-market.tsx +++ b/apps/governance/src/routes/proposals/propose/update-market/propose-update-market.tsx @@ -9,7 +9,10 @@ import { } from '@vegaprotocol/proposals'; import { useEnvironment } from '@vegaprotocol/environment'; import { createDocsLinks, validateJson } from '@vegaprotocol/utils'; -import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers'; +import { + NetworkParams, + useNetworkParams, +} from '@vegaprotocol/network-parameters'; import { ProposalFormDescription, ProposalFormDownloadJson, diff --git a/apps/governance/src/routes/proposals/test-helpers/mocks.ts b/apps/governance/src/routes/proposals/test-helpers/mocks.ts index abb233013..bead8e64d 100644 --- a/apps/governance/src/routes/proposals/test-helpers/mocks.ts +++ b/apps/governance/src/routes/proposals/test-helpers/mocks.ts @@ -1,6 +1,6 @@ -import { NetworkParamsDocument } from '@vegaprotocol/react-helpers'; +import { NetworkParamsDocument } from '@vegaprotocol/network-parameters'; import type { MockedResponse } from '@apollo/client/testing'; -import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers'; +import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters'; import type { PubKey } from '@vegaprotocol/wallet'; export const mockPubkey: PubKey = { diff --git a/apps/governance/src/routes/rewards/home/rewards-page.tsx b/apps/governance/src/routes/rewards/home/rewards-page.tsx index d0e92bdc5..79ac560d9 100644 --- a/apps/governance/src/routes/rewards/home/rewards-page.tsx +++ b/apps/governance/src/routes/rewards/home/rewards-page.tsx @@ -12,7 +12,10 @@ import { } from '@vegaprotocol/ui-toolkit'; import { useVegaWallet } from '@vegaprotocol/wallet'; import { createDocsLinks } from '@vegaprotocol/utils'; -import { useNetworkParams, NetworkParams } from '@vegaprotocol/react-helpers'; +import { + useNetworkParams, + NetworkParams, +} from '@vegaprotocol/network-parameters'; import { useEpochQuery } from './__generated__/Rewards'; import { EpochCountdown } from '../../../components/epoch-countdown'; import { Heading, SubHeading } from '../../../components/heading'; diff --git a/libs/accounts/src/lib/transfer-container.tsx b/libs/accounts/src/lib/transfer-container.tsx index c3284d990..e95d3e6a4 100644 --- a/libs/accounts/src/lib/transfer-container.tsx +++ b/libs/accounts/src/lib/transfer-container.tsx @@ -1,7 +1,10 @@ import * as Schema from '@vegaprotocol/types'; import { addDecimal, truncateByChars } from '@vegaprotocol/utils'; import { t } from '@vegaprotocol/i18n'; -import { NetworkParams, useNetworkParam } from '@vegaprotocol/react-helpers'; +import { + NetworkParams, + useNetworkParam, +} from '@vegaprotocol/network-parameters'; import { useDataProvider } from '@vegaprotocol/data-provider'; import type { Transfer } from '@vegaprotocol/wallet'; import { useVegaTransactionStore, useVegaWallet } from '@vegaprotocol/wallet'; diff --git a/libs/cypress/mock.ts b/libs/cypress/mock.ts index 085659195..3c90c5cda 100644 --- a/libs/cypress/mock.ts +++ b/libs/cypress/mock.ts @@ -20,7 +20,7 @@ export * from '../market-list/src/lib/markets.mock'; export * from '../oracles/src/lib/oracle-spec-data-connection.mock'; export * from '../orders/src/lib/components/order-data-provider/orders.mock'; export * from '../positions/src/lib/positions.mock'; -export * from '../react-helpers/src/hooks/network-params.mock'; -export * from '../react-helpers/src/lib/chain-id.mock'; +export * from '../network-parameters/src/network-params.mock'; +export * from '../wallet/src/connect-dialog/chain-id.mock'; export * from '../trades/src/lib/trades.mock'; export * from '../withdraws/src/lib/withdrawal.mock'; diff --git a/libs/network-parameters/.babelrc b/libs/network-parameters/.babelrc new file mode 100644 index 000000000..ccae900be --- /dev/null +++ b/libs/network-parameters/.babelrc @@ -0,0 +1,12 @@ +{ + "presets": [ + [ + "@nrwl/react/babel", + { + "runtime": "automatic", + "useBuiltIns": "usage" + } + ] + ], + "plugins": [] +} diff --git a/libs/network-parameters/.eslintrc.json b/libs/network-parameters/.eslintrc.json new file mode 100644 index 000000000..db820c5d0 --- /dev/null +++ b/libs/network-parameters/.eslintrc.json @@ -0,0 +1,18 @@ +{ + "extends": ["plugin:@nrwl/nx/react", "../../.eslintrc.json"], + "ignorePatterns": ["!**/*", "__generated__"], + "overrides": [ + { + "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], + "rules": {} + }, + { + "files": ["*.ts", "*.tsx"], + "rules": {} + }, + { + "files": ["*.js", "*.jsx"], + "rules": {} + } + ] +} diff --git a/libs/network-parameters/README.md b/libs/network-parameters/README.md new file mode 100644 index 000000000..a59d49e2e --- /dev/null +++ b/libs/network-parameters/README.md @@ -0,0 +1,7 @@ +# network-parameters + +This library was generated with [Nx](https://nx.dev). + +## Running unit tests + +Run `nx test network-parameters` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/network-parameters/jest.config.ts b/libs/network-parameters/jest.config.ts new file mode 100644 index 000000000..5b08f9251 --- /dev/null +++ b/libs/network-parameters/jest.config.ts @@ -0,0 +1,13 @@ +/* eslint-disable */ +export default { + displayName: 'network-parameters', + preset: '../../jest.preset.js', + transform: { + '^.+\\.[tj]sx?$': [ + '@swc/jest', + { jsc: { transform: { react: { runtime: 'automatic' } } } }, + ], + }, + moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], + coverageDirectory: '../../coverage/libs/network-parameters', +}; diff --git a/libs/network-parameters/package.json b/libs/network-parameters/package.json new file mode 100644 index 000000000..a1e690122 --- /dev/null +++ b/libs/network-parameters/package.json @@ -0,0 +1,4 @@ +{ + "name": "@vegaprotocol/network-parameters", + "version": "0.0.1" +} diff --git a/libs/network-parameters/project.json b/libs/network-parameters/project.json new file mode 100644 index 000000000..272326079 --- /dev/null +++ b/libs/network-parameters/project.json @@ -0,0 +1,43 @@ +{ + "$schema": "../../node_modules/nx/schemas/project-schema.json", + "sourceRoot": "libs/network-parameters/src", + "projectType": "library", + "tags": [], + "targets": { + "build": { + "executor": "@nrwl/web:rollup", + "outputs": ["{options.outputPath}"], + "options": { + "outputPath": "dist/libs/network-parameters", + "tsConfig": "libs/network-parameters/tsconfig.lib.json", + "project": "libs/network-parameters/package.json", + "entryFile": "libs/network-parameters/src/index.ts", + "external": ["react/jsx-runtime"], + "rollupConfig": "@nrwl/react/plugins/bundle-rollup", + "compiler": "swc", + "assets": [ + { + "glob": "libs/network-parameters/README.md", + "input": ".", + "output": "." + } + ] + } + }, + "lint": { + "executor": "@nrwl/linter:eslint", + "outputs": ["{options.outputFile}"], + "options": { + "lintFilePatterns": ["libs/network-parameters/**/*.{ts,tsx,js,jsx}"] + } + }, + "test": { + "executor": "@nrwl/jest:jest", + "outputs": ["coverage/libs/network-parameters"], + "options": { + "jestConfig": "libs/network-parameters/jest.config.ts", + "passWithNoTests": true + } + } + } +} diff --git a/libs/react-helpers/src/hooks/NetworkParams.graphql b/libs/network-parameters/src/NetworkParams.graphql similarity index 100% rename from libs/react-helpers/src/hooks/NetworkParams.graphql rename to libs/network-parameters/src/NetworkParams.graphql diff --git a/libs/react-helpers/src/hooks/__generated__/NetworkParams.ts b/libs/network-parameters/src/__generated__/NetworkParams.ts similarity index 100% rename from libs/react-helpers/src/hooks/__generated__/NetworkParams.ts rename to libs/network-parameters/src/__generated__/NetworkParams.ts diff --git a/libs/network-parameters/src/index.ts b/libs/network-parameters/src/index.ts new file mode 100644 index 000000000..10457e6b4 --- /dev/null +++ b/libs/network-parameters/src/index.ts @@ -0,0 +1,2 @@ +export * from './use-network-params'; +export * from './__generated__/NetworkParams'; diff --git a/libs/react-helpers/src/hooks/network-params.mock.ts b/libs/network-parameters/src/network-params.mock.ts similarity index 100% rename from libs/react-helpers/src/hooks/network-params.mock.ts rename to libs/network-parameters/src/network-params.mock.ts diff --git a/libs/react-helpers/src/hooks/use-network-params.spec.tsx b/libs/network-parameters/src/use-network-params.spec.tsx similarity index 100% rename from libs/react-helpers/src/hooks/use-network-params.spec.tsx rename to libs/network-parameters/src/use-network-params.spec.tsx diff --git a/libs/react-helpers/src/hooks/use-network-params.ts b/libs/network-parameters/src/use-network-params.ts similarity index 100% rename from libs/react-helpers/src/hooks/use-network-params.ts rename to libs/network-parameters/src/use-network-params.ts diff --git a/libs/network-parameters/tsconfig.json b/libs/network-parameters/tsconfig.json new file mode 100644 index 000000000..4c089585e --- /dev/null +++ b/libs/network-parameters/tsconfig.json @@ -0,0 +1,25 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "jsx": "react-jsx", + "allowJs": true, + "esModuleInterop": true, + "allowSyntheticDefaultImports": true, + "forceConsistentCasingInFileNames": true, + "strict": true, + "noImplicitOverride": true, + "noPropertyAccessFromIndexSignature": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true + }, + "files": [], + "include": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] +} diff --git a/libs/network-parameters/tsconfig.lib.json b/libs/network-parameters/tsconfig.lib.json new file mode 100644 index 000000000..af84f21cf --- /dev/null +++ b/libs/network-parameters/tsconfig.lib.json @@ -0,0 +1,23 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../dist/out-tsc", + "types": ["node"] + }, + "files": [ + "../../node_modules/@nrwl/react/typings/cssmodule.d.ts", + "../../node_modules/@nrwl/react/typings/image.d.ts" + ], + "exclude": [ + "jest.config.ts", + "**/*.spec.ts", + "**/*.test.ts", + "**/*.spec.tsx", + "**/*.test.tsx", + "**/*.spec.js", + "**/*.test.js", + "**/*.spec.jsx", + "**/*.test.jsx" + ], + "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"] +} diff --git a/libs/network-parameters/tsconfig.spec.json b/libs/network-parameters/tsconfig.spec.json new file mode 100644 index 000000000..ff08addd6 --- /dev/null +++ b/libs/network-parameters/tsconfig.spec.json @@ -0,0 +1,20 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] + }, + "include": [ + "jest.config.ts", + "**/*.test.ts", + "**/*.spec.ts", + "**/*.test.tsx", + "**/*.spec.tsx", + "**/*.test.js", + "**/*.spec.js", + "**/*.test.jsx", + "**/*.spec.jsx", + "**/*.d.ts" + ] +} diff --git a/libs/oracles/src/lib/__generated__/OracleMarketsSpec.ts b/libs/oracles/src/lib/__generated__/OracleMarketsSpec.ts index f45568150..583b378dd 100644 --- a/libs/oracles/src/lib/__generated__/OracleMarketsSpec.ts +++ b/libs/oracles/src/lib/__generated__/OracleMarketsSpec.ts @@ -3,7 +3,6 @@ import * as Types from '@vegaprotocol/types'; import { gql } from '@apollo/client'; import * as Apollo from '@apollo/client'; const defaultOptions = {} as const; - export type OracleMarketSpecFieldsFragment = { __typename?: 'Market', id: string, state: Types.MarketState, tradingMode: Types.MarketTradingMode, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } } }; export type DataSourceSpecFragment = { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } }; @@ -106,4 +105,4 @@ export function useOracleMarketsSpecLazyQuery(baseOptions?: Apollo.LazyQueryHook } export type OracleMarketsSpecQueryHookResult = ReturnType; export type OracleMarketsSpecLazyQueryHookResult = ReturnType; -export type OracleMarketsSpecQueryResult = Apollo.QueryResult; +export type OracleMarketsSpecQueryResult = Apollo.QueryResult; \ No newline at end of file diff --git a/libs/proposals/src/lib/proposals-list/use-column-defs.tsx b/libs/proposals/src/lib/proposals-list/use-column-defs.tsx index be65fbdc6..e0e571ab0 100644 --- a/libs/proposals/src/lib/proposals-list/use-column-defs.tsx +++ b/libs/proposals/src/lib/proposals-list/use-column-defs.tsx @@ -5,7 +5,10 @@ import { DateRangeFilter, SetFilter } from '@vegaprotocol/datagrid'; import { useEnvironment } from '@vegaprotocol/environment'; import { getDateTimeFormat } from '@vegaprotocol/utils'; import { t } from '@vegaprotocol/i18n'; -import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers'; +import { + NetworkParams, + useNetworkParams, +} from '@vegaprotocol/network-parameters'; import type { VegaICellRendererParams, VegaValueFormatterParams, diff --git a/libs/react-helpers/src/hooks/index.ts b/libs/react-helpers/src/hooks/index.ts index dbf2e0dba..724ae9f81 100644 --- a/libs/react-helpers/src/hooks/index.ts +++ b/libs/react-helpers/src/hooks/index.ts @@ -1,9 +1,7 @@ -export * from './__generated__/NetworkParams'; export * from './use-apply-grid-transaction'; export * from './use-fetch'; export * from './use-local-storage'; export * from './use-mutation-observer'; -export * from './use-network-params'; export * from './use-navigator-online'; export * from './use-number-parts'; export * from './use-outside-click'; diff --git a/libs/react-helpers/src/lib/index.ts b/libs/react-helpers/src/lib/index.ts index 93ab45d31..37a3d05e8 100644 --- a/libs/react-helpers/src/lib/index.ts +++ b/libs/react-helpers/src/lib/index.ts @@ -1,4 +1,3 @@ -export * from './__generated__/ChainId'; export * from './ag-grid-update'; export * from './format'; export * from './grid'; diff --git a/libs/react-helpers/tsconfig.lib.json b/libs/react-helpers/tsconfig.lib.json index a6088421e..fb68e918a 100644 --- a/libs/react-helpers/tsconfig.lib.json +++ b/libs/react-helpers/tsconfig.lib.json @@ -24,6 +24,9 @@ "**/*.jsx", "**/*.ts", "**/*.tsx", - "../data-provider/src/use-data-provider.spec.ts" + "../data-provider/src/use-data-provider.spec.ts", + "../network-parameters/src/use-network-params.ts", + "../network-parameters/src/network-params.mock.ts", + "../wallet/src/connect-dialog/chain-id.mock.ts" ] } diff --git a/libs/react-helpers/src/lib/ChainId.graphql b/libs/wallet/src/connect-dialog/ChainId.graphql similarity index 100% rename from libs/react-helpers/src/lib/ChainId.graphql rename to libs/wallet/src/connect-dialog/ChainId.graphql diff --git a/libs/react-helpers/src/lib/__generated__/ChainId.ts b/libs/wallet/src/connect-dialog/__generated__/ChainId.ts similarity index 100% rename from libs/react-helpers/src/lib/__generated__/ChainId.ts rename to libs/wallet/src/connect-dialog/__generated__/ChainId.ts diff --git a/libs/react-helpers/src/lib/chain-id.mock.ts b/libs/wallet/src/connect-dialog/chain-id.mock.ts similarity index 100% rename from libs/react-helpers/src/lib/chain-id.mock.ts rename to libs/wallet/src/connect-dialog/chain-id.mock.ts diff --git a/libs/wallet/src/connect-dialog/connect-dialog.spec.tsx b/libs/wallet/src/connect-dialog/connect-dialog.spec.tsx index 60aed606c..5f981c86e 100644 --- a/libs/wallet/src/connect-dialog/connect-dialog.spec.tsx +++ b/libs/wallet/src/connect-dialog/connect-dialog.spec.tsx @@ -22,8 +22,8 @@ import { WalletError, } from '../connectors'; import { useEnvironment } from '@vegaprotocol/environment'; -import type { ChainIdQuery } from '@vegaprotocol/react-helpers'; -import { ChainIdDocument } from '@vegaprotocol/react-helpers'; +import type { ChainIdQuery } from './__generated__/ChainId'; +import { ChainIdDocument } from './__generated__/ChainId'; const mockUpdateDialogOpen = jest.fn(); const mockCloseVegaDialog = jest.fn(); diff --git a/libs/wallet/src/connect-dialog/connect-dialog.tsx b/libs/wallet/src/connect-dialog/connect-dialog.tsx index 8c30bdc15..5c085bf52 100644 --- a/libs/wallet/src/connect-dialog/connect-dialog.tsx +++ b/libs/wallet/src/connect-dialog/connect-dialog.tsx @@ -12,7 +12,6 @@ import { useCallback, useState } from 'react'; import type { WalletClientError } from '@vegaprotocol/wallet-client'; import { ExternalLinks } from '@vegaprotocol/utils'; import { t } from '@vegaprotocol/i18n'; -import { useChainIdQuery } from '@vegaprotocol/react-helpers'; import type { VegaConnector } from '../connectors'; import { ViewConnector } from '../connectors'; import { JsonRpcConnector, RestConnector } from '../connectors'; @@ -27,6 +26,7 @@ import { import type { Status } from '../use-json-rpc-connect'; import { useJsonRpcConnect } from '../use-json-rpc-connect'; import { ViewConnectorForm } from './view-connector-form'; +import { useChainIdQuery } from './__generated__/ChainId'; export const CLOSE_DELAY = 1700; type Connectors = { [key: string]: VegaConnector }; diff --git a/libs/web3/src/lib/use-ethereum-config.ts b/libs/web3/src/lib/use-ethereum-config.ts index c38e5f0b1..9dcb45ea8 100644 --- a/libs/web3/src/lib/use-ethereum-config.ts +++ b/libs/web3/src/lib/use-ethereum-config.ts @@ -1,4 +1,4 @@ -import { useNetworkParamsQuery } from '@vegaprotocol/react-helpers'; +import { useNetworkParamsQuery } from '@vegaprotocol/network-parameters'; import { removePaginationWrapper } from '@vegaprotocol/utils'; import { useMemo } from 'react'; diff --git a/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.spec.tsx b/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.spec.tsx index 960c77b37..f9321ea35 100644 --- a/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.spec.tsx +++ b/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.spec.tsx @@ -16,8 +16,8 @@ import type { EthTransactionStore } from './use-ethereum-transaction-store'; import { WithdrawalApprovalDocument } from '@vegaprotocol/wallet'; import type { WithdrawalApprovalQuery } from '@vegaprotocol/wallet'; -import { NetworkParamsDocument } from '@vegaprotocol/react-helpers'; -import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers'; +import { NetworkParamsDocument } from '@vegaprotocol/network-parameters'; +import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters'; const mockWeb3Provider = jest.fn(); diff --git a/tsconfig.base.json b/tsconfig.base.json index 020d9ed18..db2ec726c 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -36,6 +36,9 @@ "@vegaprotocol/market-list": ["libs/market-list/src/index.ts"], "@vegaprotocol/mock": ["libs/cypress/mock.ts"], "@vegaprotocol/network-info": ["libs/network-info/src/index.ts"], + "@vegaprotocol/network-parameters": [ + "libs/network-parameters/src/index.ts" + ], "@vegaprotocol/network-stats": ["libs/network-stats/src/index.ts"], "@vegaprotocol/oracles": ["libs/oracles/src/index.ts"], "@vegaprotocol/orders": ["libs/orders/src/index.ts"], diff --git a/workspace.json b/workspace.json index a91729d86..0315f095d 100644 --- a/workspace.json +++ b/workspace.json @@ -26,6 +26,7 @@ "market-list": "libs/market-list", "multisig-signer": "apps/multisig-signer", "network-info": "libs/network-info", + "network-parameters": "libs/network-parameters", "network-stats": "libs/network-stats", "oracles": "libs/oracles", "orders": "libs/orders",