From 784e2074aefea1202a8abfacffa8725ac623f4dc Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 9 Mar 2021 21:35:20 +0100 Subject: [PATCH] Rococo reset (genesisHash update) (#4795) --- jest.config.cjs | 25 ++++++++++--------- .../src/endpoints/testingRococo.ts | 2 +- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/jest.config.cjs b/jest.config.cjs index 79e25f7431..5a5ba80460 100644 --- a/jest.config.cjs +++ b/jest.config.cjs @@ -5,27 +5,28 @@ const config = require('@polkadot/dev/config/jest.cjs'); const findPackages = require('./scripts/findPackages.cjs'); -const internalModules = findPackages() - .filter(({ name }) => !['@polkadot/apps'].includes(name)) - .reduce((modules, { dir, name }) => { - modules[`${name}(.*)$`] = `/packages/${dir}/src/$1`; - - return modules; - }, {}); - const defaultConfig = { moduleNameMapper: { - ...internalModules, + ...( + findPackages() + .filter(({ name }) => !['@polkadot/apps'].includes(name)) + .reduce((modules, { dir, name }) => { + modules[`${name}(.*)$`] = `/packages/${dir}/src/$1`; + + return modules; + }, {}) + ), '@polkadot/apps/(.*)$': '/packages/apps/src/$1', '\\.(css|less)$': 'empty/object', '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': 'empty/object', '\\.(md)$': '/jest/mocks/empty.js' }, setupFilesAfterEnv: ['/jest/jest-setup.ts'], - transformIgnorePatterns: ['/node_modules/(?!@polkadot|@babel/runtime/helpers/esm/|rxjs/_esm5)'] + transformIgnorePatterns: ['/node_modules/(?!@polkadot|@babel/runtime/helpers/esm/)'] }; -module.exports = Object.assign({}, config, { +module.exports = { + ...config, projects: [ { ...defaultConfig, @@ -39,4 +40,4 @@ module.exports = Object.assign({}, config, { } ], testTimeout: 25000 -}); +}; diff --git a/packages/apps-config/src/endpoints/testingRococo.ts b/packages/apps-config/src/endpoints/testingRococo.ts index fd70fcd2ee..d81e475219 100644 --- a/packages/apps-config/src/endpoints/testingRococo.ts +++ b/packages/apps-config/src/endpoints/testingRococo.ts @@ -18,7 +18,7 @@ import { expandEndpoints } from './util'; export function createRococo (t: TFunction): LinkOption[] { return expandEndpoints(t, [{ dnslink: 'rococo', - genesisHash: '0xf60989b1d5edd03c1947d557dc56982800a3fec377702be5e87ee6f30b6298f9', + genesisHash: '0x6c4843189dfdd83fd17277915d67b7163706dccad8267d0d4e9e85c620f1fe3b', info: 'rococo', text: t('rpc.rococo', 'Rococo', { ns: 'apps-config' }), providers: {