test: remove failing wait

test: remove only
Merge branch 'develop' into test/oraacle-profile-e2e-tests
2023-05-10 17:33:58 +02:00 · 2023-05-10 17:30:48 +02:00 · 2023-05-10 17:30:08 +02:00 · 2023-05-10 15:26:27 +00:00 · 2023-05-10 17:23:07 +02:00 · 2023-05-10 15:03:47 +00:00
14 changed files with 492 additions and 80 deletions
@@ -119,7 +119,7 @@ jobs:
        run: |
          echo "Check ipfs-hash"
          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash > ${{ matirx.app }}-ipfs-hash
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash > ${{ matrix.app }}-ipfs-hash
          echo "List html directory"
          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local sh -c 'apk add --update tree; tree /usr/share/nginx/html'

@@ -1,20 +1,20 @@
 .PHONY: latest-release
 latest-release:
-  gh release list | head -n 1 | awk '{print $1}'
+	gh release list | head -n 1 | awk '{print $1}'

 .PHONY: show-latest-release
 show-latest-release:
-  gh release view `gh release list | head -n 1 | awk '{print $1}'`
+	gh release view `gh release list | head -n 1 | awk '{print $1}'`

 .PHONY: recalculate-ipfs
 recalculate-ipfs:
-  echo "ipfs hash inside the image"
-  docker run --rm ${TAG} cat /ipfs-hash
-  echo "recalculating ipfs hash"
-  docker run --rm ${TAG} ipfs add -rw /usr/share/nginx/html
+	echo "ipfs hash inside the image"
+	docker run --rm ${TAG} cat /ipfs-hash
+	echo "recalculating ipfs hash"
+	docker run --rm ${TAG} ipfs add -rw /usr/share/nginx/html

 .PHONY: eject-ipfs-hash
 unpack:
-  docker create --name=dist ${TAG}
-  docker cp dist:/usr/share/nginx/html dist
-  docker rm dist
+	docker create --name=dist ${TAG}
+	docker cp dist:/usr/share/nginx/html dist
+	docker rm dist
@@ -2,6 +2,7 @@
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
+NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_ENV=MAINNET
 NX_BLOCK_EXPLORER=https://be.vega.community/rest/
 NX_ETHERSCAN_URL=https://etherscan.io
@@ -7,6 +7,7 @@ import {
  waitForSpinner,
  navigateTo,
  navigation,
+  turnTelemetryOff,
 } from '../../support/common.functions';
 import {
  clickOnValidatorFromList,
@@ -56,6 +57,7 @@ context(
    // 2001-STKE-002, 2001-STKE-032
    before('visit staking tab and connect vega wallet', function () {
      cy.visit('/');
+      cy.validatorsSelfDelegate();
      ethereumWalletConnect();
      // this is a workaround for #2422 which can be removed once issue is resolved
      cy.associateTokensToVegaWallet('4');
@@ -67,6 +69,7 @@ context(
        'teardown wallet & drill into a specific validator',
        function () {
          cy.clearLocalStorage();
+          turnTelemetryOff();
          cy.reload();
          waitForSpinner();
          cy.connectVegaWallet();
@@ -252,10 +255,10 @@ context(
          waitForBeginningOfEpoch();
          cy.getByTestId(stakeValidatorListStakePercentage).should(
            'have.text',
-            '100%'
+            '50.02%'
          );
          navigateTo(navigation.validators);
-          validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
+          validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
        }
      );

@@ -29,7 +29,10 @@ const performancePenaltyToolTip = '[data-testid="performance-penalty-tooltip"]';
 const overstakedPenaltyToolTip = '[data-testid="overstaked-penalty-tooltip"]';
 const totalPenaltyToolTip = '[data-testid="total-penalty-tooltip"]';
 const epochCountDown = '[data-testid="epoch-countdown"]';
-const stakeNumberRegex = /^\d*\.?\d*$/;
+const stakeNumberRegex = /^\d{1,3}(,\d{3})*(\.\d+)?$/;
+
+// If running locally, validators need to have self-stake to be displayed
+// Run cy.validatorsSelfDelegate() in before hook

 context('Validators Page - verify elements on page', function () {
  before('navigate to validators page', function () {
@@ -84,13 +87,13 @@ context('Validators Page - verify elements on page', function () {

          cy.get(stakedByOperatorToolTip)
            .invoke('text')
-            .should('contain', 'Staked by operator: 0.00');
+            .should('contain', 'Staked by operator: 3,000.00');
          cy.get(stakedByDelegatesToolTip)
            .invoke('text')
            .should('contain', 'Staked by delegates: 0.00');
          cy.get(totalStakedToolTip)
            .invoke('text')
-            .should('contain', 'Total stake: 0.00');
+            .should('contain', 'Total stake: 3,000.00');
        });

        it('Should be able to see validator normalised voting power', function () {
@@ -106,10 +109,10 @@ context('Validators Page - verify elements on page', function () {

          cy.get(unnormalisedVotingPowerToolTip)
            .invoke('text')
-            .should('contain', 'Unnormalised voting power: 0.00%');
+            .should('contain', 'Unnormalised voting power: 20.00%');
          cy.get(normalisedVotingPowerToolTip)
            .invoke('text')
-            .should('contain', 'Normalised voting power: 0.10%');
+            .should('contain', 'Normalised voting power: 50.00%');
        });

        // 2002-SINC-018
@@ -126,13 +129,13 @@ context('Validators Page - verify elements on page', function () {

          cy.get(performancePenaltyToolTip)
            .invoke('text')
-            .should('contain', 'Performance penalty: 100.00%');
+            .should('contain', 'Performance penalty: 0.00%');
          cy.get(overstakedPenaltyToolTip)
            .invoke('text')
-            .should('contain', 'Overstaked penalty:'); // value not asserted due to #2886
+            .should('contain', 'Overstaked penalty: 60.00%'); // value not asserted due to #2886
          cy.get(totalPenaltyToolTip)
            .invoke('text')
-            .should('contain', 'Total penalties: 0.00%');
+            .should('contain', 'Total penalties: 60.00%');
        });

        it('Should be able to see validator pending stake', function () {
@@ -48,8 +48,8 @@
    "tranche_start": "2023-04-20T00:00:00.000Z",
    "tranche_end": "2023-05-20T00:00:00.000Z",
    "total_added": "19242.125",
-    "total_removed": "1523.8177488329475",
-    "locked_amount": "6570.0201729841825026125",
+    "total_removed": "1979.64045368475",
+    "locked_amount": "6088.8928113908174973875",
    "deposits": [
      {
        "amount": "188",
@@ -228,6 +228,16 @@
        "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
        "tx": "0x2b3571c143ecebddf91fb62f402d516d51110edfe37b13200a6e5cf682dc5bb0"
      },
+      {
+        "amount": "336.4580555509875",
+        "user": "0xf915Da10e5136352Ba049acB0545Deb119054256",
+        "tx": "0x7af5942634e236f5f9c580f4ed042794ed309e83885f652a55ab37793ea2e85c"
+      },
+      {
+        "amount": "119.364649300815",
+        "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
+        "tx": "0x47f5bf2c758c5270dd1b6519ac649ddabef8199f8a0bae319e36f8ac5c9c142e"
+      },
      {
        "amount": "202.093666077975",
        "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
@@ -362,6 +372,12 @@
            "tranche_id": 56,
            "tx": "0x2b3571c143ecebddf91fb62f402d516d51110edfe37b13200a6e5cf682dc5bb0"
          },
+          {
+            "amount": "119.364649300815",
+            "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
+            "tranche_id": 56,
+            "tx": "0x47f5bf2c758c5270dd1b6519ac649ddabef8199f8a0bae319e36f8ac5c9c142e"
+          },
          {
            "amount": "195.89040769089",
            "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
@@ -370,8 +386,8 @@
          }
        ],
        "total_tokens": "914.25",
-        "withdrawn_tokens": "504.71220630471",
-        "remaining_tokens": "409.53779369529"
+        "withdrawn_tokens": "624.076855605525",
+        "remaining_tokens": "290.173144394475"
      },
      {
        "address": "0x9573BDF7FfC5519912d293e4D1f750eab2E471E7",
@@ -705,6 +721,12 @@
          }
        ],
        "withdrawals": [
+          {
+            "amount": "336.4580555509875",
+            "user": "0xf915Da10e5136352Ba049acB0545Deb119054256",
+            "tranche_id": 56,
+            "tx": "0x7af5942634e236f5f9c580f4ed042794ed309e83885f652a55ab37793ea2e85c"
+          },
          {
            "amount": "422.1034736680125",
            "user": "0xf915Da10e5136352Ba049acB0545Deb119054256",
@@ -713,8 +735,8 @@
          }
        ],
        "total_tokens": "1121.25",
-        "withdrawn_tokens": "422.1034736680125",
-        "remaining_tokens": "699.1465263319875"
+        "withdrawn_tokens": "758.561529219",
+        "remaining_tokens": "362.688470781"
      },
      {
        "address": "0x237D23FcA6d7B2530C7614a9cB921CF27924911E",
@@ -877,7 +899,7 @@
    "tranche_start": "2023-04-06T00:00:00.000Z",
    "tranche_end": "2023-05-06T00:00:00.000Z",
    "total_added": "14610",
-    "total_removed": "6141.45090157707",
+    "total_removed": "6675.45090157707",
    "locked_amount": "0",
    "deposits": [
      {
@@ -1077,6 +1099,11 @@
        "user": "0x9E53F72210479BF46aE7ABF77c48B0d611b3c3dB",
        "tx": "0x1dbcf713b48965a82aa2e17cb3e7db9a491668d859d408a39c8a74b0ea860b6b"
      },
+      {
+        "amount": "534",
+        "user": "0x2586bA83696a92b5467Aaa0CF9EEC052F28F2c02",
+        "tx": "0x5aa922056cad64f97a7dfa750da57d63abfdaea4499192d4d57958bfb4fba2ea"
+      },
      {
        "amount": "106.53500000286",
        "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
@@ -1200,10 +1227,17 @@
            "tx": "0xf970ea0ce3e36fa0014d24bb830dd2ea0dbea06f6e53af486de5ee7e1c63e540"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "534",
+            "user": "0x2586bA83696a92b5467Aaa0CF9EEC052F28F2c02",
+            "tranche_id": 54,
+            "tx": "0x5aa922056cad64f97a7dfa750da57d63abfdaea4499192d4d57958bfb4fba2ea"
+          }
+        ],
        "total_tokens": "534",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "534"
+        "withdrawn_tokens": "534",
+        "remaining_tokens": "0"
      },
      {
        "address": "0xBf1AaB792D729fA125e6D7122D4b916a1E1C44B1",
@@ -1826,7 +1860,7 @@
    "tranche_start": "2023-03-06T00:00:00.000Z",
    "tranche_end": "2023-04-06T00:00:00.000Z",
    "total_added": "14099",
-    "total_removed": "3722.49002352036",
+    "total_removed": "3785.49002352036",
    "locked_amount": "0",
    "deposits": [
      {
@@ -2591,6 +2625,11 @@
      }
    ],
    "withdrawals": [
+      {
+        "amount": "63",
+        "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc",
+        "tx": "0xb0edcc25e422bc3db3ad8027dfdfc0928abd7a8af8957a1699e4cf2dc8cee8f7"
+      },
      {
        "amount": "30",
        "user": "0xBe9F912Ad481C61B653463E8F1D2b2b310D49861",
@@ -3629,10 +3668,17 @@
            "tx": "0xd4a269b070cbaaff7e29a99f6b3997117d765f69512bb760e28bade799fcbba4"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "63",
+            "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc",
+            "tranche_id": 53,
+            "tx": "0xb0edcc25e422bc3db3ad8027dfdfc0928abd7a8af8957a1699e4cf2dc8cee8f7"
+          }
+        ],
        "total_tokens": "63",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "63"
+        "withdrawn_tokens": "63",
+        "remaining_tokens": "0"
      },
      {
        "address": "0xc3B1eB0feE837Db0A3ded5bf16A050726955195B",
@@ -4861,7 +4907,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "86666.297",
    "total_removed": "0",
-    "locked_amount": "49683.1009092296761910951",
+    "locked_amount": "49504.9919953353951513585",
    "deposits": [
      {
        "amount": "86666.297",
@@ -4927,7 +4973,7 @@
    "tranche_end": "2023-06-01T00:00:00.000Z",
    "total_added": "2500",
    "total_removed": "0",
-    "locked_amount": "305.538226241351125",
+    "locked_amount": "295.23443859381355",
    "deposits": [
      {
        "amount": "2500",
@@ -4960,7 +5006,7 @@
    "tranche_end": "2023-11-01T00:00:00.000Z",
    "total_added": "15000.000000000000015",
    "total_removed": "0",
-    "locked_amount": "14286.1290383454105142861290383454105",
+    "locked_amount": "14224.9782986111115142249782986111115",
    "deposits": [
      {
        "amount": "1.5e-14",
@@ -5048,7 +5094,7 @@
    "tranche_end": "2023-09-01T00:00:00.000Z",
    "total_added": "17500",
    "total_removed": "0",
-    "locked_amount": "10865.52010995370325",
+    "locked_amount": "10794.17758026368775",
    "deposits": [
      {
        "amount": "12500",
@@ -5315,7 +5361,7 @@
    "tranche_end": "2023-08-01T00:00:00.000Z",
    "total_added": "37500",
    "total_removed": "18077.0118744",
-    "locked_amount": "17246.515788060160125",
+    "locked_amount": "17091.10506829343025",
    "deposits": [
      {
        "amount": "7500",
@@ -5734,7 +5780,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "129999.45",
    "total_removed": "0",
-    "locked_amount": "49637.7713310174637779075",
+    "locked_amount": "49459.824919096584707505",
    "deposits": [
      {
        "amount": "129999.45",
@@ -5767,7 +5813,7 @@
    "tranche_end": "2024-04-01T00:00:00.000Z",
    "total_added": "54144.7663",
    "total_removed": "0",
-    "locked_amount": "48411.21764968406449080437",
+    "locked_amount": "48300.2481374426486922947",
    "deposits": [
      {
        "amount": "54144.7663",
@@ -5800,7 +5846,7 @@
    "tranche_end": "2023-09-03T00:00:00.000Z",
    "total_added": "62600",
    "total_removed": "0",
-    "locked_amount": "19936.502048452562182",
+    "locked_amount": "19807.852061136476024",
    "deposits": [
      {
        "amount": "10000",
@@ -5993,7 +6039,7 @@
    "tranche_end": "2023-09-17T00:00:00.000Z",
    "total_added": "5000",
    "total_removed": "0",
-    "locked_amount": "1784.15319000507335",
+    "locked_amount": "1773.87763191273475",
    "deposits": [
      {
        "amount": "5000",
@@ -7062,7 +7108,7 @@
    "tranche_end": "2023-06-02T00:00:00.000Z",
    "total_added": "1939928.38",
    "total_removed": "1709370.7872515768348",
-    "locked_amount": "123534.5481966065072434858",
+    "locked_amount": "119547.7788438730317094704",
    "deposits": [
      {
        "amount": "1852091.69",
@@ -40934,7 +40980,7 @@
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "3732368.4671",
    "total_removed": "715655.108029600523393",
-    "locked_amount": "214330.915145972181008792886",
+    "locked_amount": "208204.638696483881349131871",
    "deposits": [
      {
        "amount": "1998.95815",
@@ -42327,7 +42373,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "15870102.715470999700000001",
    "total_removed": "872635.89843522227071852",
-    "locked_amount": "6059691.24938843042043456221192312067585835",
+    "locked_amount": "6037967.8664430882362406121449295313314409",
    "deposits": [
      {
        "amount": "16249.93",
@@ -59103,7 +59149,7 @@
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "472355.6199999996",
    "total_removed": "44544.1737890903416",
-    "locked_amount": "33961.958672622378193436739320136",
+    "locked_amount": "32991.215149911803725776786707268",
    "deposits": [
      {
        "amount": "3000",
@@ -6,6 +6,7 @@ const row = 'key-value-table-row';
 const marketTitle = 'accordion-title';
 const externalLink = 'external-link';
 const accordionContent = 'accordion-content';
+const providerName = 'provider-name';

 describe('market info is displayed', { tags: '@smoke' }, () => {
  beforeEach(() => {
@@ -181,9 +182,20 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
    cy.getByTestId(marketTitle).contains('Oracle').click();

    cy.getByTestId(accordionContent)
-      .getByTestId('provider-name')
+      .getByTestId(providerName)
      .and('contain', 'Another oracle');

+    cy.getByTestId(providerName).should('be.visible').click();
+
+    cy.getByTestId('dialog-content')
+      .eq(1)
+      .within(() => {
+        cy.getByTestId('block-explorer-link').contains('Block explorer');
+        cy.getByTestId('github-link').contains('Oracle repository');
+        cy.getByTestId('verified-accounts').contains('0 proofs of ownership');
+      });
+    cy.getByTestId('dialog-close').click();
+
    cy.getByTestId(accordionContent)
      .getByTestId('verified-proofs')
      .and('contain', '1');
@@ -17,7 +17,6 @@ describe('ethereum wallet', { tags: '@smoke', testIsolation: true }, () => {
  it('can connect', () => {
    // 0004-EWAL-001

-    cy.wait('@NetworkParams');
    cy.getByTestId('Deposits').click();
    cy.getByTestId('deposit-button').click();
    cy.getByTestId('connect-eth-wallet-btn').click();
@@ -30,7 +29,6 @@ describe('ethereum wallet', { tags: '@smoke', testIsolation: true }, () => {
  it('should see QR code modal for WalletConnect', () => {
    // 0004-EWAL-003

-    cy.wait('@NetworkParams');
    cy.getByTestId('Deposits').click();
    cy.getByTestId('deposit-button').click();
    cy.getByTestId('connect-eth-wallet-btn').click();
@@ -4,18 +4,15 @@ import { NodeHealth, NodeUrl, HealthIndicator } from './footer';
 import { MockedProvider } from '@apollo/client/testing';
 import { Intent } from '@vegaprotocol/ui-toolkit';

+const mockSetNodeSwitcher = jest.fn();
+
 jest.mock('@vegaprotocol/environment', () => ({
  ...jest.requireActual('@vegaprotocol/environment'),
  useEnvironment: jest.fn().mockImplementation(() => ({
    VEGA_URL: 'https://vega-url.wtf',
    VEGA_INCIDENT_URL: 'https://blog.vega.community',
  })),
-}));
-
-const mockSetNodeSwitcher = jest.fn();
-jest.mock('../../stores', () => ({
-  ...jest.requireActual('../../stores'),
-  useGlobalStore: () => mockSetNodeSwitcher,
+  useNodeSwitcherStore: jest.fn(() => mockSetNodeSwitcher),
 }));

 describe('NodeHealth', () => {
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 yarn --pure-lockfile
-app={$1:-trading}
-flags="--env=${$2:-mainnet}"
+app=${1:-trading}
+flags="--env=${2:-mainnet}"
 yarn install
 if [ "${app}" = "trading" ]; then
  yarn nx export trading $flags
@@ -0,0 +1,280 @@
+import { VegaDataSource } from './data-source';
+import type { ApolloClient } from '@apollo/client';
+import { Interval } from 'pennant';
+import type {
+  CandleFieldsFragment,
+  CandlesQuery,
+} from './__generated__/Candles';
+import * as Schema from '@vegaprotocol/types';
+
+const returnDataMocks = (nodes: CandleFieldsFragment[]): CandlesQuery => {
+  return {
+    data: {
+      market: {
+        decimalPlaces: 1,
+        positionDecimalPlaces: 1,
+        candlesConnection: {
+          edges: nodes.map((node) => ({ node })),
+        },
+      },
+    },
+  } as CandlesQuery;
+};
+
+const dataMocks: { [key in Schema.Interval]: Partial<CandleFieldsFragment>[] } =
+  {
+    [Schema.Interval.INTERVAL_I1M]: [
+      {
+        __typename: 'Candle',
+        periodStart: '2023-05-10T12:00:00Z',
+        lastUpdateInPeriod: '',
+        close: '10',
+        volume: '1',
+      },
+      {
+        __typename: 'Candle',
+        periodStart: '2023-05-10T12:05:00Z',
+        lastUpdateInPeriod: '',
+        close: '5',
+        volume: '2',
+      },
+    ],
+    [Schema.Interval.INTERVAL_I5M]: [
+      {
+        __typename: 'Candle',
+        periodStart: '2023-05-10T12:00:00Z',
+        lastUpdateInPeriod: '',
+        close: '10',
+        volume: '1',
+      },
+      {
+        __typename: 'Candle',
+        periodStart: '2023-05-10T12:25:00Z',
+        lastUpdateInPeriod: '',
+        close: '5',
+        volume: '2',
+      },
+    ],
+    [Schema.Interval.INTERVAL_I15M]: [
+      {
+        __typename: 'Candle',
+        periodStart: '2023-05-10T12:00:00Z',
+        lastUpdateInPeriod: '',
+        close: '10',
+        volume: '1',
+      },
+      {
+        __typename: 'Candle',
+        periodStart: '2023-05-10T13:15:00Z',
+        lastUpdateInPeriod: '',
+        close: '5',
+        volume: '2',
+      },
+    ],
+    [Schema.Interval.INTERVAL_I1H]: [
+      {
+        __typename: 'Candle',
+        periodStart: '2023-05-10T12:00:00Z',
+        lastUpdateInPeriod: '',
+        close: '10',
+        volume: '1',
+      },
+      {
+        __typename: 'Candle',
+        periodStart: '2023-05-10T17:00:00Z',
+        lastUpdateInPeriod: '',
+        close: '5',
+        volume: '2',
+      },
+    ],
+    [Schema.Interval.INTERVAL_I6H]: [
+      {
+        __typename: 'Candle',
+        periodStart: '2023-05-10T12:00:00Z',
+        lastUpdateInPeriod: '',
+        close: '10',
+        volume: '1',
+      },
+      {
+        __typename: 'Candle',
+        periodStart: '2023-05-11T18:00:00Z',
+        lastUpdateInPeriod: '',
+        close: '5',
+        volume: '2',
+      },
+    ],
+    [Schema.Interval.INTERVAL_I1D]: [
+      {
+        __typename: 'Candle',
+        periodStart: '2023-05-10T00:00:00Z',
+        lastUpdateInPeriod: '',
+        close: '10',
+        volume: '1',
+      },
+      {
+        __typename: 'Candle',
+        periodStart: '2023-05-15T00:00:00Z',
+        lastUpdateInPeriod: '',
+        close: '5',
+        volume: '2',
+      },
+    ],
+    [Schema.Interval.INTERVAL_BLOCK]: [],
+  };
+
+describe('VegaDataSource', () => {
+  const marketId = 'marketId';
+  const partyId = 'partyId';
+  const client = {
+    query: jest.fn().mockImplementation(({ variables: { interval } }) => {
+      return returnDataMocks(
+        dataMocks[interval as Schema.Interval] as CandleFieldsFragment[]
+      );
+    }),
+  } as unknown as ApolloClient<object>;
+
+  it('should be properly initialized', () => {
+    const dataSource = new VegaDataSource(client, marketId, partyId);
+    expect(dataSource).toBeInstanceOf(VegaDataSource);
+    expect(dataSource.onReady).toBeDefined();
+    expect(dataSource.query).toBeDefined();
+    expect(dataSource.subscribeData).toBeDefined();
+    expect(dataSource.unsubscribeData).toBeDefined();
+    expect(dataSource.decimalPlaces).toBeDefined();
+    expect(dataSource.positionDecimalPlaces).toBeDefined();
+  });
+
+  describe('query should return continuous data', () => {
+    it('when interval is I1M', async () => {
+      const dataSource = new VegaDataSource(client, marketId, partyId);
+      const data = await dataSource.query(Interval.I1M, '');
+      expect(data).toHaveLength(6);
+      expect(data[1]).toStrictEqual({
+        date: new Date('2023-05-10T12:01:00Z'),
+        high: 1,
+        low: 1,
+        open: 1,
+        close: 1,
+        volume: 0,
+      });
+      expect(data[2]).toStrictEqual({
+        date: new Date('2023-05-10T12:02:00Z'),
+        high: 1,
+        low: 1,
+        open: 1,
+        close: 1,
+        volume: 0,
+      });
+    });
+
+    it('when interval is I5M', async () => {
+      const dataSource = new VegaDataSource(client, marketId, partyId);
+      const data = await dataSource.query(Interval.I5M, '');
+      expect(data).toHaveLength(6);
+      expect(data[1]).toStrictEqual({
+        date: new Date('2023-05-10T12:05:00Z'),
+        high: 1,
+        low: 1,
+        open: 1,
+        close: 1,
+        volume: 0,
+      });
+      expect(data[2]).toStrictEqual({
+        date: new Date('2023-05-10T12:10:00Z'),
+        high: 1,
+        low: 1,
+        open: 1,
+        close: 1,
+        volume: 0,
+      });
+    });
+
+    it('when interval is I15M', async () => {
+      const dataSource = new VegaDataSource(client, marketId, partyId);
+      const data = await dataSource.query(Interval.I15M, '');
+      expect(data).toHaveLength(6);
+      expect(data[1]).toStrictEqual({
+        date: new Date('2023-05-10T12:15:00Z'),
+        high: 1,
+        low: 1,
+        open: 1,
+        close: 1,
+        volume: 0,
+      });
+      expect(data[2]).toStrictEqual({
+        date: new Date('2023-05-10T12:30:00Z'),
+        high: 1,
+        low: 1,
+        open: 1,
+        close: 1,
+        volume: 0,
+      });
+    });
+
+    it('when interval is I1H', async () => {
+      const dataSource = new VegaDataSource(client, marketId, partyId);
+      const data = await dataSource.query(Interval.I1H, '');
+      expect(data).toHaveLength(6);
+      expect(data[1]).toStrictEqual({
+        date: new Date('2023-05-10T13:00:00Z'),
+        high: 1,
+        low: 1,
+        open: 1,
+        close: 1,
+        volume: 0,
+      });
+      expect(data[2]).toStrictEqual({
+        date: new Date('2023-05-10T14:00:00Z'),
+        high: 1,
+        low: 1,
+        open: 1,
+        close: 1,
+        volume: 0,
+      });
+    });
+
+    it('when interval is I6H', async () => {
+      const dataSource = new VegaDataSource(client, marketId, partyId);
+      const data = await dataSource.query(Interval.I6H, '');
+      expect(data).toHaveLength(6);
+      expect(data[1]).toStrictEqual({
+        date: new Date('2023-05-10T18:00:00Z'),
+        high: 1,
+        low: 1,
+        open: 1,
+        close: 1,
+        volume: 0,
+      });
+      expect(data[2]).toStrictEqual({
+        date: new Date('2023-05-11T00:00:00Z'),
+        high: 1,
+        low: 1,
+        open: 1,
+        close: 1,
+        volume: 0,
+      });
+    });
+
+    it('when interval is I1D', async () => {
+      const dataSource = new VegaDataSource(client, marketId, partyId);
+      const data = await dataSource.query(Interval.I1D, '');
+      expect(data).toHaveLength(6);
+      expect(data[1]).toStrictEqual({
+        date: new Date('2023-05-11T00:00:00Z'),
+        high: 1,
+        low: 1,
+        open: 1,
+        close: 1,
+        volume: 0,
+      });
+      expect(data[2]).toStrictEqual({
+        date: new Date('2023-05-12T00:00:00Z'),
+        high: 1,
+        low: 1,
+        open: 1,
+        close: 1,
+        volume: 0,
+      });
+    });
+  });
+});
@@ -1,4 +1,11 @@
 import type { ApolloClient } from '@apollo/client';
+import type { Duration } from 'date-fns';
+import {
+  add,
+  differenceInDays,
+  differenceInHours,
+  differenceInMinutes,
+} from 'date-fns';
 import type { Candle, DataSource } from 'pennant';
 import { Interval as PennantInterval } from 'pennant';

@@ -153,7 +160,6 @@ export class VegaDataSource implements DataSource {
        },
        fetchPolicy: 'no-cache',
      });
-
      if (data?.market?.candlesConnection?.edges) {
        const decimalPlaces = data.market.decimalPlaces;
        const positionDecimalPlaces = data.market.positionDecimalPlaces;
@@ -163,8 +169,8 @@ export class VegaDataSource implements DataSource {
          .filter((node): node is CandleFieldsFragment => !!node)
          .map((node) =>
            parseCandle(node, decimalPlaces, positionDecimalPlaces)
-          );
-
+          )
+          .reduce(checkGranulationContinuity(interval), []);
        return candles;
      } else {
        return [];
@@ -213,6 +219,85 @@ export class VegaDataSource implements DataSource {
  }
 }

+const getDuration = (
+  interval: PennantInterval,
+  multiplier: number
+): Duration => {
+  switch (interval) {
+    case 'I1D':
+      return {
+        days: 1 * multiplier,
+      };
+    case 'I1H':
+      return {
+        hours: 1 * multiplier,
+      };
+    case 'I1M':
+      return {
+        minutes: 1 * multiplier,
+      };
+    case 'I5M':
+      return {
+        minutes: 5 * multiplier,
+      };
+    case 'I6H':
+      return {
+        hours: 6 * multiplier,
+      };
+    case 'I15M':
+      return {
+        minutes: 15 * multiplier,
+      };
+  }
+};
+
+const getDifference = (
+  interval: PennantInterval,
+  dateLeft: Date,
+  dateRight: Date
+): number => {
+  switch (interval) {
+    case 'I1D':
+      return differenceInDays(dateRight, dateLeft);
+    case 'I6H':
+      return differenceInHours(dateRight, dateLeft) / 6;
+    case 'I1H':
+      return differenceInHours(dateRight, dateLeft);
+    case 'I15M':
+      return differenceInMinutes(dateRight, dateLeft) / 15;
+    case 'I5M':
+      return differenceInMinutes(dateRight, dateLeft) / 5;
+    case 'I1M':
+      return differenceInMinutes(dateRight, dateLeft);
+  }
+};
+
+const checkGranulationContinuity =
+  (interval: PennantInterval) =>
+  (agg: Candle[], candle: Candle, i: number): Candle[] => {
+    if (agg.length && i) {
+      const previous = agg[agg.length - 1];
+      const difference = getDifference(interval, previous.date, candle.date);
+      if (difference > 1) {
+        for (let j = 1; j < difference; j++) {
+          const duration = getDuration(interval, j);
+          const newStartDate = add(previous.date, duration);
+          const newParsedCandle: Candle = {
+            date: newStartDate,
+            high: previous.close,
+            low: previous.close,
+            open: previous.close,
+            close: previous.close,
+            volume: 0,
+          };
+          agg.push(newParsedCandle);
+        }
+      }
+    }
+    agg.push(candle);
+    return agg;
+  };
+
 function parseCandle(
  candle: CandleFieldsFragment,
  decimalPlaces: number,
@@ -97,7 +97,7 @@ export const useColumnSizes = ({
  const setSizes = useCallback(
    (apiEvent: GridReadyEvent | GridSizeChangedEvent) => {
      if (!storeKey || !Object.keys(sizes).length || !widthRef.current) {
-        apiEvent.api.sizeColumnsToFit();
+        apiEvent?.api.sizeColumnsToFit();
      } else {
        const recalculatedSizes = recalculateSizes(sizes);
        const newSizes = Object.entries(recalculatedSizes).map(
@@ -96,13 +96,13 @@ describe('RowData', () => {
    mockHeaders(props.url);
    render(renderComponent(props, statsQueryMock, subMock));

-    // radio should be disabled until query resolves
+    // radio should be enabled until query resolves
    expect(
      screen.getByRole('radio', {
        checked: false,
        name: props.url,
      })
-    ).toBeDisabled();
+    ).toBeEnabled();
    expect(screen.getByTestId('response-time-cell')).toHaveTextContent(
      'Checking'
    );
@@ -124,7 +124,7 @@ describe('RowData', () => {
    });
  });

-  it('radio button disabled if query fails', async () => {
+  it('radio button still enabled if query fails', async () => {
    mockHeaders(props.url, {});

    const failedQueryMock: MockedResponse<StatisticsQuery> = {
@@ -149,7 +149,7 @@ describe('RowData', () => {
        checked: false,
        name: props.url,
      })
-    ).toBeDisabled();
+    ).toBeEnabled();
    expect(screen.getByTestId('response-time-cell')).toHaveTextContent(
      'Checking'
    );
@@ -170,7 +170,7 @@ describe('RowData', () => {
          checked: false,
          name: props.url,
        })
-      ).toBeDisabled();
+      ).toBeEnabled();
    });
  });

@@ -207,19 +207,6 @@ describe('RowData', () => {
    expect(screen.getByTestId('block-height-cell')).toHaveClass('text-danger');
  });

-  it('disables radio button if url is invalid', () => {
-    mockHeaders(props.url, { blockHeight: 100 });
-
-    render(renderComponent(props, statsQueryMock, subMock));
-
-    expect(
-      screen.getByRole('radio', {
-        checked: false,
-        name: props.url,
-      })
-    ).toBeDisabled();
-  });
-
  it('doesnt render the radio if its the custom row', () => {
    render(
      renderComponent(
Author	SHA1	Message	Date
Dariusz Majcherczyk	08e6848ef6	test: remove failing wait	2023-05-10 17:33:58 +02:00
Dariusz Majcherczyk	03ba61307f	test: remove only	2023-05-10 17:30:48 +02:00
Dariusz Majcherczyk	2a5b17f00d	Merge branch 'develop' into test/oraacle-profile-e2e-tests	2023-05-10 17:30:08 +02:00
Maciek	dc7832ac81	chore(candles-chart): fill up missing candles (#3664 )	2023-05-10 15:26:27 +00:00
Dariusz Majcherczyk	ed42ed7f76	test: fix wallet eth tests	2023-05-10 17:23:07 +02:00
Joe Tsang	91207d31ee	chore(governance): fix failing validator tests (#3703 )	2023-05-10 15:03:47 +00:00
Dariusz Majcherczyk	36e6d665a0	test: fix for api column size error	2023-05-10 15:06:57 +02:00
dexturr	58efb460a6	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-10 12:10:00 +00:00
Mikołaj Młodzikowski	044f98777b	feat(ci): lint makefile	2023-05-10 13:43:33 +02:00
Mikołaj Młodzikowski	00fdc5e81a	fix(ci): preparing dist bash syntax	2023-05-10 13:33:17 +02:00
Mikołaj Młodzikowski	adfad3bafb	feat(ci): fix typo	2023-05-10 13:21:53 +02:00
Dariusz Majcherczyk	dd998e2d7f	test: fix for ci	2023-05-10 12:45:41 +02:00
Dariusz Majcherczyk	5468136d31	test: show full oracle profile info in markets e2e	2023-05-10 12:00:17 +02:00
dexturr	e6ae88905c	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-10 06:07:15 +00:00
dexturr	3953ed9953	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-10 00:15:02 +00:00
Matthew Russell	b48ab58e6a	chore: add VEGA_URL for explorer mainnet	2023-05-09 14:06:10 -07:00
Matthew Russell	e44cf1ff53	chore(environment,trading): fix unit tests for footer and node switcher (#3682 )	2023-05-09 13:39:17 -07:00