From ae10cdfb2cfcc65597d1f7cbb2052dcb0ea6397c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20G=C5=82ownia?= Date: Wed, 5 Oct 2022 21:57:55 +0200 Subject: [PATCH] chore: move generateAccounts to seerate file (#1623) --- .../src/integration/portfolio-page.test.ts | 6 +- .../src/support/mocks/generate-accounts.ts | 46 +--------- .../src/support/mocks/generate-assets.ts | 55 ++++++++++++ .../trading-e2e/src/integration/deposit.cy.ts | 2 +- .../src/integration/withdraw.cy.ts | 6 +- .../src/support/mocks/generate-accounts.ts | 87 +----------------- .../src/support/mocks/generate-assets.ts | 90 +++++++++++++++++++ apps/trading-e2e/src/support/trading.ts | 3 +- 8 files changed, 154 insertions(+), 141 deletions(-) create mode 100644 apps/console-lite-e2e/src/support/mocks/generate-assets.ts create mode 100644 apps/trading-e2e/src/support/mocks/generate-assets.ts diff --git a/apps/console-lite-e2e/src/integration/portfolio-page.test.ts b/apps/console-lite-e2e/src/integration/portfolio-page.test.ts index 70ee696aa..8b4ca89af 100644 --- a/apps/console-lite-e2e/src/integration/portfolio-page.test.ts +++ b/apps/console-lite-e2e/src/integration/portfolio-page.test.ts @@ -8,10 +8,8 @@ import { emptyPositions, generateMargins, } from '../support/mocks/generate-positions'; -import { - generateAccounts, - generateAssets, -} from '../support/mocks/generate-accounts'; +import { generateAccounts } from '../support/mocks/generate-accounts'; +import { generateAssets } from '../support/mocks/generate-assets'; import { generateOrders } from '../support/mocks/generate-orders'; import { generateFills } from '../support/mocks/generate-fills'; import { diff --git a/apps/console-lite-e2e/src/support/mocks/generate-accounts.ts b/apps/console-lite-e2e/src/support/mocks/generate-accounts.ts index bd5cdaf2f..5cf9bdf95 100644 --- a/apps/console-lite-e2e/src/support/mocks/generate-accounts.ts +++ b/apps/console-lite-e2e/src/support/mocks/generate-accounts.ts @@ -1,7 +1,6 @@ import merge from 'lodash/merge'; import type { AccountsQuery } from '@vegaprotocol/accounts'; -import type { AssetsQuery } from '@vegaprotocol/assets'; -import { AccountType, Schema as Types } from '@vegaprotocol/types'; +import { AccountType } from '@vegaprotocol/types'; import type { PartialDeep } from 'type-fest'; export const generateAccounts = ( @@ -76,46 +75,3 @@ export const generateAccounts = ( }; return merge(defaultAccounts, override); }; - -export const generateAssets = (override?: PartialDeep) => { - const defaultAssets: AssetsQuery = { - assetsConnection: { - edges: [ - { - node: { - id: 'asset-id', - symbol: 'tEURO', - decimals: 5, - name: 'Euro', - source: {}, - quantum: '', - status: Types.AssetStatus.STATUS_ENABLED, - }, - }, - { - node: { - id: 'asset-id-2', - symbol: 'tDAI', - decimals: 5, - name: 'DAI', - source: {}, - quantum: '', - status: Types.AssetStatus.STATUS_ENABLED, - }, - }, - { - node: { - id: 'asset-0', - symbol: 'AST0', - decimals: 5, - name: 'Asto', - source: {}, - quantum: '', - status: Types.AssetStatus.STATUS_ENABLED, - }, - }, - ], - }, - }; - return merge(defaultAssets, override); -}; diff --git a/apps/console-lite-e2e/src/support/mocks/generate-assets.ts b/apps/console-lite-e2e/src/support/mocks/generate-assets.ts new file mode 100644 index 000000000..dfee971f3 --- /dev/null +++ b/apps/console-lite-e2e/src/support/mocks/generate-assets.ts @@ -0,0 +1,55 @@ +import merge from 'lodash/merge'; +import type { AssetsQuery } from '@vegaprotocol/assets'; +import { Schema as Types } from '@vegaprotocol/types'; +import type { PartialDeep } from 'type-fest'; + +export const generateAssets = (override?: PartialDeep) => { + const defaultAssets: AssetsQuery = { + assetsConnection: { + edges: [ + { + node: { + id: 'asset-id', + symbol: 'tEURO', + decimals: 5, + name: 'Euro', + source: { + __typename: 'ERC20', + contractAddress: '0x0158031158Bb4dF2AD02eAA31e8963E84EA978a4', + }, + quantum: '', + status: Types.AssetStatus.STATUS_ENABLED, + }, + }, + { + node: { + id: 'asset-id-2', + symbol: 'tDAI', + decimals: 5, + name: 'DAI', + source: { + __typename: 'ERC20', + contractAddress: '0x0158031158Bb4dF2AD02eAA31e8963E84EA978a4', + }, + quantum: '', + status: Types.AssetStatus.STATUS_ENABLED, + }, + }, + { + node: { + id: 'asset-0', + symbol: 'AST0', + decimals: 5, + name: 'Asto', + source: { + __typename: 'BuiltinAsset', + }, + quantum: '', + status: Types.AssetStatus.STATUS_ENABLED, + }, + }, + ], + }, + }; + return merge(defaultAssets, override); +}; diff --git a/apps/trading-e2e/src/integration/deposit.cy.ts b/apps/trading-e2e/src/integration/deposit.cy.ts index 3d2e1a823..ce071e291 100644 --- a/apps/trading-e2e/src/integration/deposit.cy.ts +++ b/apps/trading-e2e/src/integration/deposit.cy.ts @@ -1,5 +1,5 @@ import { aliasQuery } from '@vegaprotocol/cypress'; -import { generateAssets } from '../support/mocks/generate-accounts'; +import { generateAssets } from '../support/mocks/generate-assets'; import { generateNetworkParameters } from '../support/mocks/generate-network-parameters'; const connectEthWalletBtn = 'connect-eth-wallet-btn'; diff --git a/apps/trading-e2e/src/integration/withdraw.cy.ts b/apps/trading-e2e/src/integration/withdraw.cy.ts index 30c77ce01..b47a9cb18 100644 --- a/apps/trading-e2e/src/integration/withdraw.cy.ts +++ b/apps/trading-e2e/src/integration/withdraw.cy.ts @@ -1,10 +1,8 @@ import { aliasQuery } from '@vegaprotocol/cypress'; import { connectEthereumWallet } from '../support/ethereum-wallet'; import { generateChainId } from '../support/mocks/generate-chain-id'; -import { - generateAccounts, - generateAssets, -} from '../support/mocks/generate-accounts'; +import { generateAccounts } from '../support/mocks/generate-accounts'; +import { generateAssets } from '../support/mocks/generate-assets'; import { generateNetworkParameters } from '../support/mocks/generate-network-parameters'; import { generateWithdrawals } from '../support/mocks/generate-withdrawals'; import { connectVegaWallet } from '../support/vega-wallet'; diff --git a/apps/trading-e2e/src/support/mocks/generate-accounts.ts b/apps/trading-e2e/src/support/mocks/generate-accounts.ts index d1b86c9ca..a277be603 100644 --- a/apps/trading-e2e/src/support/mocks/generate-accounts.ts +++ b/apps/trading-e2e/src/support/mocks/generate-accounts.ts @@ -1,7 +1,6 @@ import merge from 'lodash/merge'; import type { AccountsQuery } from '@vegaprotocol/accounts'; -import type { AssetsQuery } from '@vegaprotocol/assets'; -import { AccountType, Schema as Types } from '@vegaprotocol/types'; +import { AccountType } from '@vegaprotocol/types'; import type { PartialDeep } from 'type-fest'; export const generateAccounts = ( @@ -87,87 +86,3 @@ export const generateAccounts = ( }; return merge(defaultAccounts, override); }; - -export const generateAssets = (override?: PartialDeep) => { - const defaultAssets: AssetsQuery = { - assetsConnection: { - edges: [ - { - node: { - id: 'asset-id', - symbol: 'tEURO', - decimals: 5, - name: 'Euro', - source: { - __typename: 'ERC20', - contractAddress: '0x0158031158Bb4dF2AD02eAA31e8963E84EA978a4', - }, - quantum: '1', - status: Types.AssetStatus.STATUS_ENABLED, - }, - }, - { - node: { - id: 'asset-id-2', - symbol: 'tDAI', - decimals: 5, - name: 'DAI', - source: { - __typename: 'ERC20', - contractAddress: '0x26223f9C67871CFcEa329975f7BC0C9cB8FBDb9b', - }, - quantum: '1', - status: Types.AssetStatus.STATUS_ENABLED, - }, - }, - { - node: { - id: 'asset-0', - symbol: 'AST0', - decimals: 5, - name: 'Asto', - source: {}, - quantum: '1', - status: Types.AssetStatus.STATUS_ENABLED, - }, - }, - // NOTE: These assets ids and contract addresses are real assets on Sepolia, this is needed - // because we don't currently mock our seplia infura provider. If we change network these will - // need to be updated - { - node: { - id: 'cee709223217281d7893b650850ae8ee8a18b7539b5658f9b4cc24de95dd18ad', - symbol: 'tBTC', - name: 'Sepolia tBTC', - decimals: 5, - status: Types.AssetStatus.STATUS_ENABLED, - source: { - __typename: 'ERC20', - contractAddress: '0x1d525fB145Af5c51766a89706C09fE07E6058D1D', - }, - quantum: '1', - __typename: 'Asset', - }, - __typename: 'AssetEdge', - }, - { - node: { - id: 'c9fe6fc24fce121b2cc72680543a886055abb560043fda394ba5376203b7527d', - symbol: 'tUSDC', - name: 'Sepolia tUSDC', - decimals: 5, - status: Types.AssetStatus.STATUS_ENABLED, - source: { - __typename: 'ERC20', - contractAddress: '0x444b9aDA947130Fc320a144cd22bC1641e5c9d81', - }, - quantum: '1', - __typename: 'Asset', - }, - __typename: 'AssetEdge', - }, - ], - }, - }; - return merge(defaultAssets, override); -}; diff --git a/apps/trading-e2e/src/support/mocks/generate-assets.ts b/apps/trading-e2e/src/support/mocks/generate-assets.ts new file mode 100644 index 000000000..d5da22d46 --- /dev/null +++ b/apps/trading-e2e/src/support/mocks/generate-assets.ts @@ -0,0 +1,90 @@ +import merge from 'lodash/merge'; +import type { AssetsQuery } from '@vegaprotocol/assets'; +import { Schema as Types } from '@vegaprotocol/types'; +import type { PartialDeep } from 'type-fest'; + +export const generateAssets = (override?: PartialDeep) => { + const defaultAssets: AssetsQuery = { + assetsConnection: { + edges: [ + { + node: { + id: 'asset-id', + symbol: 'tEURO', + decimals: 5, + name: 'Euro', + source: { + __typename: 'ERC20', + contractAddress: '0x0158031158Bb4dF2AD02eAA31e8963E84EA978a4', + }, + quantum: '1', + status: Types.AssetStatus.STATUS_ENABLED, + }, + }, + { + node: { + id: 'asset-id-2', + symbol: 'tDAI', + decimals: 5, + name: 'DAI', + source: { + __typename: 'ERC20', + contractAddress: '0x26223f9C67871CFcEa329975f7BC0C9cB8FBDb9b', + }, + quantum: '1', + status: Types.AssetStatus.STATUS_ENABLED, + }, + }, + { + node: { + id: 'asset-0', + symbol: 'AST0', + decimals: 5, + name: 'Asto', + source: { + __typename: 'BuiltinAsset', + }, + quantum: '1', + status: Types.AssetStatus.STATUS_ENABLED, + }, + }, + // NOTE: These assets ids and contract addresses are real assets on Sepolia, this is needed + // because we don't currently mock our seplia infura provider. If we change network these will + // need to be updated + { + node: { + id: 'cee709223217281d7893b650850ae8ee8a18b7539b5658f9b4cc24de95dd18ad', + symbol: 'tBTC', + name: 'Sepolia tBTC', + decimals: 5, + status: Types.AssetStatus.STATUS_ENABLED, + source: { + __typename: 'ERC20', + contractAddress: '0x1d525fB145Af5c51766a89706C09fE07E6058D1D', + }, + quantum: '1', + __typename: 'Asset', + }, + __typename: 'AssetEdge', + }, + { + node: { + id: 'c9fe6fc24fce121b2cc72680543a886055abb560043fda394ba5376203b7527d', + symbol: 'tUSDC', + name: 'Sepolia tUSDC', + decimals: 5, + status: Types.AssetStatus.STATUS_ENABLED, + source: { + __typename: 'ERC20', + contractAddress: '0x444b9aDA947130Fc320a144cd22bC1641e5c9d81', + }, + quantum: '1', + __typename: 'Asset', + }, + __typename: 'AssetEdge', + }, + ], + }, + }; + return merge(defaultAssets, override); +}; diff --git a/apps/trading-e2e/src/support/trading.ts b/apps/trading-e2e/src/support/trading.ts index 38477e220..74f21aedc 100644 --- a/apps/trading-e2e/src/support/trading.ts +++ b/apps/trading-e2e/src/support/trading.ts @@ -1,7 +1,8 @@ import { aliasQuery } from '@vegaprotocol/cypress'; import type { MarketState } from '@vegaprotocol/types'; import type { CyHttpMessages } from 'cypress/types/net-stubbing'; -import { generateAccounts, generateAssets } from './mocks/generate-accounts'; +import { generateAccounts } from './mocks/generate-accounts'; +import { generateAssets } from './mocks/generate-assets'; import { generateCandles } from './mocks/generate-candles'; import { generateChart } from './mocks/generate-chart'; import { generateDealTicketQuery } from './mocks/generate-deal-ticket-query';