From 46f101cc0a96824be9ec2811e5176fd85bb5247b Mon Sep 17 00:00:00 2001 From: wirednkod Date: Fri, 2 Jun 2023 15:50:02 +0300 Subject: [PATCH] minor fixes on ordering for satisfying linter; Typescript update --- javascript/package-lock.json | 12 +-- javascript/packages/cli/package.json | 2 +- javascript/packages/orchestrator/package.json | 2 +- .../packages/orchestrator/src/constants.ts | 90 +++++++++---------- .../orchestrator/src/jsapi-helpers/index.ts | 10 +-- .../src/paras-decorators/index.ts | 2 +- 6 files changed, 59 insertions(+), 59 deletions(-) diff --git a/javascript/package-lock.json b/javascript/package-lock.json index 4c09d9a31..54b2b5a0b 100644 --- a/javascript/package-lock.json +++ b/javascript/package-lock.json @@ -6022,15 +6022,15 @@ } }, "node_modules/typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz", + "integrity": "sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=12.20" + "node": ">=14.17" } }, "node_modules/uint8arrays": { @@ -6360,7 +6360,7 @@ "commander": "^10.0.1", "debug": "^4.3.4", "nunjucks": "^3.2.4", - "typescript": "^5.0.4" + "typescript": "^5.1.3" }, "bin": { "zombienet": "dist/cli.js" @@ -6396,7 +6396,7 @@ "napi-maybe-compressed-blob": "^0.0.11", "peer-id": "^0.16.0", "tmp-promise": "^3.0.3", - "typescript": "^5.0.4", + "typescript": "^5.1.3", "yaml": "^2.3.1" }, "devDependencies": { diff --git a/javascript/packages/cli/package.json b/javascript/packages/cli/package.json index b4d789d98..97273c38c 100644 --- a/javascript/packages/cli/package.json +++ b/javascript/packages/cli/package.json @@ -59,7 +59,7 @@ "commander": "^10.0.1", "debug": "^4.3.4", "nunjucks": "^3.2.4", - "typescript": "^5.0.4" + "typescript": "^5.1.3" }, "devDependencies": { "@types/cli-progress": "^3.11.0", diff --git a/javascript/packages/orchestrator/package.json b/javascript/packages/orchestrator/package.json index dbc968d2e..8fe11dfec 100644 --- a/javascript/packages/orchestrator/package.json +++ b/javascript/packages/orchestrator/package.json @@ -51,7 +51,7 @@ "napi-maybe-compressed-blob": "^0.0.11", "peer-id": "^0.16.0", "tmp-promise": "^3.0.3", - "typescript": "^5.0.4", + "typescript": "^5.1.3", "yaml": "^2.3.1" }, "devDependencies": { diff --git a/javascript/packages/orchestrator/src/constants.ts b/javascript/packages/orchestrator/src/constants.ts index 57972d170..3636db2ef 100644 --- a/javascript/packages/orchestrator/src/constants.ts +++ b/javascript/packages/orchestrator/src/constants.ts @@ -114,64 +114,64 @@ const ARGS_TO_REMOVE: { [key: string]: number } = { const TOKEN_PLACEHOLDER = /{{ZOMBIE:(.*?):(.*?)}}/gi; export { - REGULAR_BIN_PATH, - PROMETHEUS_PORT, - RPC_WS_PORT, - RPC_HTTP_PORT, - P2P_PORT, - JAEGER_AGENT_ZIPKIN_COMPACT_PORT, - JAEGER_AGENT_SERVE_CONFIGS_PORT, - JAEGER_AGENT_THRIFT_COMPACT_PORT, - JAEGER_AGENT_THRIFT_BINARY_PORT, - DEFAULT_PORTS, - DEFAULT_GLOBAL_TIMEOUT, - DEFAULT_INDIVIDUAL_TEST_TIMEOUT, - DEFAULT_COMMAND, - DEFAULT_IMAGE, + ARGS_TO_REMOVE, + BAKCCHANNEL_POD_NAME, + BAKCCHANNEL_PORT, + BAKCCHANNEL_URI_PATTERN, + DEFAULT_ADDER_COLLATOR_BIN, DEFAULT_ARGS, - DEFAULT_CHAIN, - DEFAULT_BOOTNODE_PEER_ID, + DEFAULT_BALANCE, DEFAULT_BOOTNODE_DOMAIN, - DEFAULT_REMOTE_DIR, - DEFAULT_DATA_DIR, + DEFAULT_BOOTNODE_PEER_ID, + DEFAULT_CHAIN, DEFAULT_CHAIN_SPEC, - DEFAULT_CHAIN_SPEC_RAW, DEFAULT_CHAIN_SPEC_COMMAND, - DEFAULT_GENESIS_GENERATE_SUBCOMMAND, - DEFAULT_WASM_GENERATE_SUBCOMMAND, - DEFAULT_ADDER_COLLATOR_BIN, - DEFAULT_CUMULUS_COLLATOR_BIN, + DEFAULT_CHAIN_SPEC_RAW, DEFAULT_COLLATOR_IMAGE, + DEFAULT_COMMAND, + DEFAULT_CUMULUS_COLLATOR_BIN, + DEFAULT_DATA_DIR, + DEFAULT_GENESIS_GENERATE_SUBCOMMAND, + DEFAULT_GLOBAL_TIMEOUT, + DEFAULT_IMAGE, + DEFAULT_INDIVIDUAL_TEST_TIMEOUT, DEFAULT_MAX_NOMINATIONS, + DEFAULT_PORTS, + DEFAULT_PROMETHEUS_PREFIX, + DEFAULT_PROVIDER, + DEFAULT_REMOTE_DIR, + DEFAULT_WASM_GENERATE_SUBCOMMAND, + DEV_ACCOUNTS, FINISH_MAGIC_FILE, GENESIS_STATE_FILENAME, GENESIS_WASM_FILENAME, - TMP_DONE, - TRANSFER_CONTAINER_WAIT_LOG, - NODE_CONTAINER_WAIT_LOG, - WAIT_UNTIL_SCRIPT_SUFIX, - TRANSFER_CONTAINER_NAME, - ZOMBIE_BUCKET, - WS_URI_PATTERN, - METRICS_URI_PATTERN, - LOCALHOST, - BAKCCHANNEL_URI_PATTERN, - BAKCCHANNEL_PORT, - BAKCCHANNEL_POD_NAME, - INTROSPECTOR_PORT, INTROSPECTOR_POD_NAME, + INTROSPECTOR_PORT, + JAEGER_AGENT_SERVE_CONFIGS_PORT, + JAEGER_AGENT_THRIFT_BINARY_PORT, + JAEGER_AGENT_THRIFT_COMPACT_PORT, + JAEGER_AGENT_ZIPKIN_COMPACT_PORT, + K8S_WAIT_UNTIL_SCRIPT_SUFIX, + LOCALHOST, + METRICS_URI_PATTERN, + NODE_CONTAINER_WAIT_LOG, + P2P_PORT, + PROMETHEUS_PORT, + REGULAR_BIN_PATH, + RPC_HTTP_PORT, + RPC_WS_PORT, + TMP_DONE, + TOKEN_PLACEHOLDER, TRACING_COLLATOR_NAME, - TRACING_COLLATOR_SERVICE, TRACING_COLLATOR_NAMESPACE, TRACING_COLLATOR_PODNAME, TRACING_COLLATOR_PORT, - ZOMBIE_WRAPPER, - DEFAULT_PROVIDER, - DEV_ACCOUNTS, - DEFAULT_BALANCE, - ARGS_TO_REMOVE, + TRACING_COLLATOR_SERVICE, + TRANSFER_CONTAINER_NAME, + TRANSFER_CONTAINER_WAIT_LOG, UNDYING_COLLATOR_BIN, - K8S_WAIT_UNTIL_SCRIPT_SUFIX, - TOKEN_PLACEHOLDER, - DEFAULT_PROMETHEUS_PREFIX, + WAIT_UNTIL_SCRIPT_SUFIX, + WS_URI_PATTERN, + ZOMBIE_BUCKET, + ZOMBIE_WRAPPER, }; diff --git a/javascript/packages/orchestrator/src/jsapi-helpers/index.ts b/javascript/packages/orchestrator/src/jsapi-helpers/index.ts index be814c174..c4036292b 100644 --- a/javascript/packages/orchestrator/src/jsapi-helpers/index.ts +++ b/javascript/packages/orchestrator/src/jsapi-helpers/index.ts @@ -84,13 +84,13 @@ async function registerParachain({ } export { - connect, - registerParachain, + chainCustomSectionUpgrade, chainUpgradeFromLocalFile, chainUpgradeFromUrl, - chainCustomSectionUpgrade, - validateRuntimeCode, + connect, + findPatternInSystemEventSubscription, paraGetBlockHeight, paraIsRegistered, - findPatternInSystemEventSubscription, + registerParachain, + validateRuntimeCode, }; diff --git a/javascript/packages/orchestrator/src/paras-decorators/index.ts b/javascript/packages/orchestrator/src/paras-decorators/index.ts index 92b069de9..58f9a0be3 100644 --- a/javascript/packages/orchestrator/src/paras-decorators/index.ts +++ b/javascript/packages/orchestrator/src/paras-decorators/index.ts @@ -136,4 +136,4 @@ function decorate(para: PARA, fns: Function[]) { return decorated; } -export { whichPara, decorate, PARA }; +export { PARA, decorate, whichPara };