fix: bifrost type issue & small fixes in tests (#1345)

- Add check in sanitize numbers for Bifrost object type - Add `isEthereum` entry in test results - Small fix in jest config
paritytech · Oct 27, 2023 · 567170b · 567170b
1 parent 8fa49aa
commit 567170b
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 6 deletions.
diff --git a/e2e-tests/historical/endpoints/kusama/runtime/spec/10000.json b/e2e-tests/historical/endpoints/kusama/runtime/spec/10000.json
@@ -12,6 +12,7 @@
         "live": null
     },
     "properties": {
+        "isEthereum": false,
         "ss58Format": "2",
         "tokenDecimals": [
             "12"

diff --git a/e2e-tests/historical/endpoints/kusama/runtime/spec/100000.json b/e2e-tests/historical/endpoints/kusama/runtime/spec/100000.json
@@ -12,6 +12,7 @@
         "live": null
     },
     "properties": {
+        "isEthereum": false,
         "ss58Format": "2",
         "tokenDecimals": [
             "12"

diff --git a/e2e-tests/historical/endpoints/kusama/runtime/spec/2000000.json b/e2e-tests/historical/endpoints/kusama/runtime/spec/2000000.json
@@ -12,6 +12,7 @@
         "live": null
     },
     "properties": {
+        "isEthereum": false,
         "ss58Format": "2",
         "tokenDecimals": [
             "12"

diff --git a/e2e-tests/historical/endpoints/kusama/runtime/spec/4000000.json b/e2e-tests/historical/endpoints/kusama/runtime/spec/4000000.json
@@ -12,6 +12,7 @@
         "live": null
     },
     "properties": {
+        "isEthereum": false,
         "ss58Format": "2",
         "tokenDecimals": [
             "12"

diff --git a/e2e-tests/historical/endpoints/kusama/runtime/spec/8000000.json b/e2e-tests/historical/endpoints/kusama/runtime/spec/8000000.json
@@ -12,6 +12,7 @@
         "live": null
     },
     "properties": {
+        "isEthereum": false,
         "ss58Format": "2",
         "tokenDecimals": [
             "12"

diff --git a/e2e-tests/historical/endpoints/polkadot/runtime/spec/1000.json b/e2e-tests/historical/endpoints/polkadot/runtime/spec/1000.json
@@ -12,6 +12,7 @@
         "live": null
     },
     "properties": {
+        "isEthereum": false,
         "ss58Format": "0",
         "tokenDecimals": [
             "10"

diff --git a/e2e-tests/historical/endpoints/polkadot/runtime/spec/200000.json b/e2e-tests/historical/endpoints/polkadot/runtime/spec/200000.json
@@ -12,6 +12,7 @@
         "live": null
     },
     "properties": {
+        "isEthereum": false,
         "ss58Format": "0",
         "tokenDecimals": [
             "10"

diff --git a/e2e-tests/historical/endpoints/polkadot/runtime/spec/3000000.json b/e2e-tests/historical/endpoints/polkadot/runtime/spec/3000000.json
@@ -12,6 +12,7 @@
         "live": null
     },
     "properties": {
+        "isEthereum": false,
         "ss58Format": "0",
         "tokenDecimals": [
             "10"

diff --git a/e2e-tests/historical/endpoints/polkadot/runtime/spec/6877002.json b/e2e-tests/historical/endpoints/polkadot/runtime/spec/6877002.json
@@ -12,6 +12,7 @@
         "live": null
     },
     "properties": {
+        "isEthereum": false,
         "ss58Format": "0",
         "tokenDecimals": [
             "10"

diff --git a/e2e-tests/historical/endpoints/westend/runtime/spec/10000.json b/e2e-tests/historical/endpoints/westend/runtime/spec/10000.json
@@ -12,6 +12,7 @@
         "live": null
     },
     "properties": {
+        "isEthereum": false,
         "ss58Format": "42",
         "tokenDecimals": [
             "12"

diff --git a/e2e-tests/historical/endpoints/westend/runtime/spec/2000000.json b/e2e-tests/historical/endpoints/westend/runtime/spec/2000000.json
@@ -12,6 +12,7 @@
         "live": null
     },
     "properties": {
+        "isEthereum": false,
         "ss58Format": "42",
         "tokenDecimals": [
             "12"

diff --git a/e2e-tests/historical/endpoints/westend/runtime/spec/7417678.json b/e2e-tests/historical/endpoints/westend/runtime/spec/7417678.json
@@ -12,6 +12,7 @@
         "live": null
     },
     "properties": {
+        "isEthereum": false,
         "ss58Format": "42",
         "tokenDecimals": [
             "12"

diff --git a/e2e-tests/jest.config.js b/e2e-tests/jest.config.js
@@ -6,9 +6,14 @@ module.exports = {
     testEnvironment: 'node',
 	maxConcurrency: 3,
 	maxWorkers: '50%',
-    globals: {
-        'ts-jest': {
-            isloatedModules: true
-        }
-    }
+    transform: {
+        // '^.+\\.[tj]sx?$' to process js/ts with `ts-jest`
+        // '^.+\\.m?[tj]sx?$' to process js/ts/mjs/mts with `ts-jest`
+        '^.+\\.tsx?$': [
+          'ts-jest',
+          {
+            isolatedModules: true
+          },
+        ],
+    },
 };
diff --git a/src/sanitize/sanitizeNumbers.ts b/src/sanitize/sanitizeNumbers.ts
@@ -236,7 +236,10 @@ function mapTypeSanitizeKeyValue(
 	const jsonMap: AnyJson = {};
 
 	map.forEach((value: unknown, key: unknown) => {
-		const nonCodecKey = sanitizeNumbers(key, options);
+		let nonCodecKey = sanitizeNumbers(key, options);
+		if (typeof nonCodecKey === 'object') {
+			nonCodecKey = JSON.stringify(nonCodecKey);
+		}
 		if (!(typeof nonCodecKey === 'string' || typeof nonCodecKey === 'number')) {
 			throw new InternalServerError(
 				'Unexpected non-string and non-number key while sanitizing a Map-like type'