Merge pull request #157 from topmonks/153-extrinsic-doesnt-load

fix #153 - extrinsic doesn't load & #80 - speedup tests
topmonks · Aug 18, 2023 · d44342a · d44342a
2 parents 2137c06 + c2d699b
commit d44342a
Show file tree

Hide file tree

Showing 22 changed files with 137 additions and 164 deletions.
diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml
@@ -30,7 +30,12 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     container:
-      image: mcr.microsoft.com/playwright:v1.30.0-focal
+      image: mcr.microsoft.com/playwright:v1.37.0-focal
+    strategy:
+      fail-fast: false
+      matrix:
+        shardIndex: [1,2,3,4,5,6,7,8,9,10]
+        shardTotal: [10]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -48,7 +53,7 @@ jobs:
       - name: Start app
         run: npm run start:test &
       - name: Run Playwright Tests
-        run: npx playwright test
+        run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
       - name: Upload test screenshots artifact
         uses: actions/upload-artifact@v3
         if: always()
@@ -60,7 +65,7 @@ jobs:
         uses: actions/upload-artifact@v3
         if: always()
         with:
-          name: test-report
+          name: test-blob-reports
           path: test/report/
           retention-days: 14
   test-report:
@@ -84,8 +89,10 @@ jobs:
       - name: Download test report artifact
         uses: actions/download-artifact@master
         with:
-          name: test-report
-          path: test/report
+          name: test-blob-reports
+          path: test/blob-reports
+      - name: Merge blob reports into HTML report
+        run: npx playwright merge-reports --config playwright.merge-reports.config.ts ./test/blob-reports
       - name: Upload Argos screenshots
         continue-on-error: true
         env:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -70,7 +70,7 @@
   "devDependencies": {
     "@argos-ci/cli": "^0.4.4",
     "@emotion/eslint-plugin": "^11.10.0",
-    "@playwright/test": "^1.30.0",
+    "@playwright/test": "^1.37.0",
     "@polkadot/api": "^10.1.4",
     "@polkadot/apps-config": "^0.124.1",
     "@subsquid/archive-registry": "^2.1.9",

diff --git a/playwright.config.ts b/playwright.config.ts
@@ -31,10 +31,14 @@ const config: Config = {
 	workers: 1,
 	/* Reporter to use. See https://playwright.dev/docs/test-reporters */
 	reporter: [
-		["html", {
-			outputFolder: "./test/report",
+		process.env.CI ? ["blob", {
+			outputDir: "./test/report",
 			open: "never"
-		}]
+		}] :
+			["html", {
+				outputFolder: "./test/report",
+				open: "never"
+			}]
 	],
 	/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
 	use: {

diff --git a/playwright.merge-reports.config.ts b/playwright.merge-reports.config.ts
@@ -0,0 +1,8 @@
+export default {
+	reporter: [
+		["html", {
+			outputFolder: "./test/report",
+			open: "never"
+		}]
+	]
+};
diff --git a/scripts/update-networks/config/squids.ts b/scripts/update-networks/config/squids.ts
@@ -1,14 +1,16 @@
-export const squidTypes = ["archive", "balances", "explorer", "main", "main-identites", "stats"] as const;
+export const squidTypes = ["archive", "explorer", "main", "identites", "stats"] as const;
 
 export const squidUrlTemplates: Record<string, (network: string) => string> = {
-	balances: (network: string) => `https://squid.subsquid.io/${network}-balances/graphql`,
 	explorer: (network: string) => `https://squid.subsquid.io/gs-explorer-${network}/graphql`,
 	main: (network: string) => `https://squid.subsquid.io/gs-main-${network}/graphql`,
 	stats: (network: string) => `https://squid.subsquid.io/gs-stats-${network}/graphql`
 };
 
 export const forceSquidUrl: Record<string, Partial<Record<typeof squidTypes[number], string>>> = {
 	"kusama": {
-		"main-identites": "https://squid.subsquid.io/gs-main-kusama/graphql"
+		"identites": "https://squid.subsquid.io/gs-main-kusama/graphql"
+	},
+	"polkadot": {
+		"identites": "https://squid.subsquid.io/gs-main-polkadot/graphql"
 	},
 };
diff --git a/src/components/DataViewerValueParsed.tsx b/src/components/DataViewerValueParsed.tsx
@@ -10,6 +10,7 @@ import { RuntimeSpec } from "../model/runtimeSpec";
 
 // found in https://github.com/polkadot-js/apps/blob/59c2badf87c29fd8cb5b7dfcc045c3ce451a54bc/packages/react-params/src/Param/findComponent.ts#L51
 const ADDRESS_TYPES = ["AccountId", "AccountId20", "AccountId32", "Address", "LookupSource", "MultiAddress"];
+const ADDRESS_KINDS = ["Id", "AccountId"];
 
 const valueTableStyle = css`
 	width: fit-content;
@@ -119,8 +120,8 @@ type MaybeAccountLinkValueProps = {
 const AccountValue = (props: MaybeAccountLinkValueProps) => {
 	const {network, value, valueMetadata, runtimeSpec} = props;
 
-	if (valueMetadata.type === "MultiAddress") {
-		if (value.__kind === "Id") {
+	if (typeof value === "object") {
+		if (ADDRESS_KINDS.includes(value.__kind)) {
 			return <ValueOfKind
 				network={network}
 				value={value}
@@ -130,15 +131,15 @@ const AccountValue = (props: MaybeAccountLinkValueProps) => {
 				}}
 				runtimeSpec={runtimeSpec}
 			/>;
-		} else {
-			return (
-				<DataViewerValueParsed
-					network={network}
-					value={value}
-					runtimeSpec={runtimeSpec}
-				/>
-			);
 		}
+
+		return (
+			<DataViewerValueParsed
+				network={network}
+				value={value}
+				runtimeSpec={runtimeSpec}
+			/>
+		);
 	}
 
 	return (

diff --git a/src/components/balances/BalancesTable.tsx b/src/components/balances/BalancesTable.tsx
@@ -88,8 +88,8 @@ function BalancesTable(props: BalancesTableProps) {
 			<BalancesItemsTableAttribute
 				label="Last update"
 				render={(balance) =>
-					<Link to={`/${network}/search?query=${balance.updatedAt}`}>
-						{balance.updatedAt}
+					<Link to={`/${network}/search?query=${balance.updatedAtBlock}`}>
+						{balance.updatedAtBlock}
 					</Link>
 				}
 			/>

diff --git a/src/model/accountBalance.ts b/src/model/accountBalance.ts
@@ -6,7 +6,7 @@ export type Balance = {
 	free: Decimal;
 	reserved: Decimal;
 	total: Decimal;
-	updatedAt?: number;
+	updatedAtBlock?: number;
 }
 
 export type AccountBalance = {

diff --git a/src/model/balance.ts b/src/model/balance.ts
@@ -7,6 +7,6 @@ export type Balance = {
 	free: Decimal;
 	reserved: Decimal;
 	total: Decimal;
-	updatedAt?: number;
+	updatedAtBlock?: number;
 	runtimeSpec: RuntimeSpec;
 }
diff --git a/src/model/explorer-squid/explorerSquidAccountBalance.ts b/src/model/explorer-squid/explorerSquidAccountBalance.ts
diff --git a/src/model/stats-squid/statsSquidAccountBalance.ts b/src/model/stats-squid/statsSquidAccountBalance.ts
@@ -0,0 +1,7 @@
+export type StatsSquidAccountBalance = {
+	id: string;
+	free: string;
+	reserved: string;
+	total: string;
+	updatedAtBlock?: number;
+}
diff --git a/src/networks.json b/src/networks.json
@@ -296,10 +296,9 @@
         "symbol": "KSM",
         "squids": {
             "archive": "https://kusama.explorer.subsquid.io/graphql",
-            "balances": "https://squid.subsquid.io/kusama-balances/graphql",
             "explorer": "https://squid.subsquid.io/gs-explorer-kusama/graphql",
             "main": "https://squid.subsquid.io/gs-main-kusama/graphql",
-            "main-identites": "https://squid.subsquid.io/gs-main-kusama/graphql",
+            "identites": "https://squid.subsquid.io/gs-main-kusama/graphql",
             "stats": "https://squid.subsquid.io/gs-stats-kusama/graphql"
         },
         "coinGeckoId": "kusama"
@@ -369,25 +368,11 @@
         "symbol": "MOVR",
         "squids": {
             "archive": "https://moonriver.explorer.subsquid.io/graphql",
-            "balances": "https://squid.subsquid.io/moonriver-balances/graphql",
             "explorer": "https://squid.subsquid.io/gs-explorer-moonriver/graphql",
             "main": "https://squid.subsquid.io/gs-main-moonriver/graphql"
         },
         "coinGeckoId": "moonriver"
     },
-    {
-        "name": "opal",
-        "displayName": "Opal",
-        "icon": "/assets/network-icons/opal.png",
-        "color": "#40bcff",
-        "website": "https://docs.unique.network/unique-and-quartz-wiki/build/get-started/testnet-and-mainnet#opal-testnet",
-        "prefix": 42,
-        "decimals": 18,
-        "symbol": "OPL",
-        "squids": {
-            "archive": "https://archive.unique.network/opal/explorer/graphql"
-        }
-    },
     {
         "name": "peaq",
         "displayName": "peaq",
@@ -447,29 +432,13 @@
         "symbol": "DOT",
         "squids": {
             "archive": "https://polkadot.explorer.subsquid.io/graphql",
-            "balances": "https://squid.subsquid.io/polkadot-balances/graphql",
             "explorer": "https://squid.subsquid.io/gs-explorer-polkadot/graphql",
             "main": "https://squid.subsquid.io/gs-main-polkadot/graphql",
+            "identites": "https://squid.subsquid.io/gs-main-polkadot/graphql",
             "stats": "https://squid.subsquid.io/gs-stats-polkadot/graphql"
         },
         "coinGeckoId": "polkadot"
     },
-    {
-        "name": "quartz",
-        "displayName": "Quartz",
-        "icon": "/assets/network-icons/quartz.png",
-        "color": "#ff4d6a",
-        "website": "https://unique.network/quartz/",
-        "parachainId": 2095,
-        "relayChain": "kusama",
-        "prefix": 255,
-        "decimals": 18,
-        "symbol": "QTZ",
-        "squids": {
-            "archive": "https://archive.unique.network/quartz/explorer/graphql"
-        },
-        "coinGeckoId": "quartz"
-    },
     {
         "name": "robonomics",
         "displayName": "Robonomics",
@@ -554,7 +523,6 @@
         "name": "statemint",
         "displayName": "Statemint",
         "icon": "/assets/network-icons/statemint.png",
-        "color": "#86e62a",
         "website": "https://www.parity.io/",
         "parachainId": 1000,
         "relayChain": "polkadot",
@@ -598,22 +566,6 @@
             "archive": "https://t0rn.explorer.subsquid.io/graphql"
         }
     },
-    {
-        "name": "unique",
-        "displayName": "Unique",
-        "icon": "/assets/network-icons/unique.png",
-        "color": "#40bcff",
-        "website": "https://unique.network/",
-        "parachainId": 2037,
-        "relayChain": "polkadot",
-        "prefix": 7391,
-        "decimals": 18,
-        "symbol": "UNQ",
-        "squids": {
-            "archive": "https://archive.unique.network/unique/explorer/graphql"
-        },
-        "coinGeckoId": "unique-network"
-    },
     {
         "name": "vara",
         "displayName": "Vara",
@@ -640,4 +592,4 @@
         },
         "coinGeckoId": "xxcoin"
     }
-]
+]
diff --git a/src/screens/network.tsx b/src/screens/network.tsx
@@ -115,7 +115,7 @@ export const NetworkPage = () => {
 								<TransfersTable network={network.name} transfers={transfers} showTime />
 							</TabPane>
 					}
-					{hasSupport(network.name, "balances-squid") &&
+					{hasSupport(network.name, "stats-squid") &&
 							<TabPane
 								label="Top holders"
 								count={topHolders.pagination.totalCount}