From e959c61bb78dcca584832e22feef84048016f782 Mon Sep 17 00:00:00 2001 From: ioedeveloper Date: Wed, 15 Mar 2023 15:46:22 +0100 Subject: [PATCH] Exit if killProcess flag is set to true --- libs/ghaction-helper/package.json | 8 ++++---- libs/remix-analyzer/package.json | 8 ++++---- libs/remix-astwalker/package.json | 6 +++--- libs/remix-debug/package.json | 12 ++++++------ libs/remix-lib/package.json | 4 ++-- libs/remix-simulator/package.json | 6 +++--- libs/remix-solidity/package.json | 6 +++--- libs/remix-tests/package.json | 10 +++++----- libs/remix-tests/src/run.ts | 4 ++-- libs/remix-tests/tests/testRunner.cli.spec.ts | 1 - .../helper/src/lib/components/custom-tooltip.tsx | 3 ++- libs/remix-url-resolver/package.json | 4 ++-- libs/remix-ws-templates/package.json | 4 ++-- 13 files changed, 38 insertions(+), 38 deletions(-) diff --git a/libs/ghaction-helper/package.json b/libs/ghaction-helper/package.json index 33e733a9ab..3da2205e87 100644 --- a/libs/ghaction-helper/package.json +++ b/libs/ghaction-helper/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/ghaction-helper", - "version": "0.1.7-alpha.16", + "version": "0.1.7-alpha.17", "description": "Solidity Tests GitHub Action Helper", "main": "src/index.js", "scripts": { @@ -19,17 +19,17 @@ }, "homepage": "https://github.com/ethereum/remix-project#readme", "devDependencies": { - "@remix-project/remix-solidity": "^0.5.11-alpha.16", + "@remix-project/remix-solidity": "^0.5.11-alpha.17", "@types/chai": "^4.3.4", "typescript": "^4.9.3" }, "dependencies": { "@ethereum-waffle/chai": "^3.4.4", - "@remix-project/remix-simulator": "^0.2.25-alpha.16", + "@remix-project/remix-simulator": "^0.2.25-alpha.17", "chai": "^4.3.7", "ethers": "^5.7.2", "web3": "^1.5.3" }, "types": "./src/index.d.ts", - "gitHead": "c915b9ab496d9e6902eb8b747425f4d267d8dce3" + "gitHead": "4806543bb099b558872793ca7a215468e0bffc81" } \ No newline at end of file diff --git a/libs/remix-analyzer/package.json b/libs/remix-analyzer/package.json index 85a76181f2..7bfa11b8cd 100644 --- a/libs/remix-analyzer/package.json +++ b/libs/remix-analyzer/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-analyzer", - "version": "0.5.34-alpha.16", + "version": "0.5.34-alpha.17", "description": "Tool to perform static analysis on Solidity smart contracts", "scripts": { "test": "./../../node_modules/.bin/ts-node --project ../../tsconfig.base.json --require tsconfig-paths/register ./../../node_modules/.bin/tape ./test/tests.ts" @@ -25,8 +25,8 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-astwalker": "^0.0.55-alpha.16", - "@remix-project/remix-lib": "^0.5.25-alpha.16", + "@remix-project/remix-astwalker": "^0.0.55-alpha.17", + "@remix-project/remix-lib": "^0.5.25-alpha.17", "async": "^2.6.2", "ethers": "^5.4.2", "ethjs-util": "^0.1.6", @@ -50,6 +50,6 @@ "typescript": "^3.7.5" }, "typings": "src/index.d.ts", - "gitHead": "c915b9ab496d9e6902eb8b747425f4d267d8dce3", + "gitHead": "4806543bb099b558872793ca7a215468e0bffc81", "main": "./src/index.js" } \ No newline at end of file diff --git a/libs/remix-astwalker/package.json b/libs/remix-astwalker/package.json index f9040710b2..4935c4698c 100644 --- a/libs/remix-astwalker/package.json +++ b/libs/remix-astwalker/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-astwalker", - "version": "0.0.55-alpha.16", + "version": "0.0.55-alpha.17", "description": "Tool to walk through Solidity AST", "main": "src/index.js", "scripts": { @@ -37,7 +37,7 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-lib": "^0.5.25-alpha.16", + "@remix-project/remix-lib": "^0.5.25-alpha.17", "@types/tape": "^4.2.33", "async": "^2.6.2", "ethers": "^5.4.2", @@ -53,6 +53,6 @@ "tap-spec": "^5.0.0" }, "typings": "src/index.d.ts", - "gitHead": "c915b9ab496d9e6902eb8b747425f4d267d8dce3", + "gitHead": "4806543bb099b558872793ca7a215468e0bffc81", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-debug/package.json b/libs/remix-debug/package.json index be62226144..bd3640f4a6 100644 --- a/libs/remix-debug/package.json +++ b/libs/remix-debug/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-debug", - "version": "0.5.25-alpha.16", + "version": "0.5.25-alpha.17", "description": "Tool to debug Ethereum transactions", "contributors": [ { @@ -26,10 +26,10 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-astwalker": "^0.0.55-alpha.16", - "@remix-project/remix-lib": "^0.5.25-alpha.16", - "@remix-project/remix-simulator": "^0.2.25-alpha.16", - "@remix-project/remix-solidity": "^0.5.11-alpha.16", + "@remix-project/remix-astwalker": "^0.0.55-alpha.17", + "@remix-project/remix-lib": "^0.5.25-alpha.17", + "@remix-project/remix-simulator": "^0.2.25-alpha.17", + "@remix-project/remix-solidity": "^0.5.11-alpha.17", "ansi-gray": "^0.1.1", "async": "^2.6.2", "color-support": "^1.1.3", @@ -69,6 +69,6 @@ }, "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-debug#readme", "typings": "src/index.d.ts", - "gitHead": "c915b9ab496d9e6902eb8b747425f4d267d8dce3", + "gitHead": "4806543bb099b558872793ca7a215468e0bffc81", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-lib/package.json b/libs/remix-lib/package.json index e2e9ea40c2..5b07a0760a 100644 --- a/libs/remix-lib/package.json +++ b/libs/remix-lib/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-lib", - "version": "0.5.25-alpha.16", + "version": "0.5.25-alpha.17", "description": "Library to various Remix tools", "contributors": [ { @@ -51,6 +51,6 @@ }, "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-lib#readme", "typings": "src/index.d.ts", - "gitHead": "c915b9ab496d9e6902eb8b747425f4d267d8dce3", + "gitHead": "4806543bb099b558872793ca7a215468e0bffc81", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-simulator/package.json b/libs/remix-simulator/package.json index 1d3f19207e..d4f83939b4 100644 --- a/libs/remix-simulator/package.json +++ b/libs/remix-simulator/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-simulator", - "version": "0.2.25-alpha.16", + "version": "0.2.25-alpha.17", "description": "Ethereum IDE and tools for the web", "contributors": [ { @@ -22,7 +22,7 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-lib": "^0.5.25-alpha.16", + "@remix-project/remix-lib": "^0.5.25-alpha.17", "ansi-gray": "^0.1.1", "async": "^3.1.0", "body-parser": "^1.18.2", @@ -67,6 +67,6 @@ }, "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-simulator#readme", "typings": "src/index.d.ts", - "gitHead": "c915b9ab496d9e6902eb8b747425f4d267d8dce3", + "gitHead": "4806543bb099b558872793ca7a215468e0bffc81", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-solidity/package.json b/libs/remix-solidity/package.json index 8b5c0dcd84..10e2076bec 100644 --- a/libs/remix-solidity/package.json +++ b/libs/remix-solidity/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-solidity", - "version": "0.5.11-alpha.16", + "version": "0.5.11-alpha.17", "description": "Tool to load and run Solidity compiler", "main": "src/index.js", "types": "src/index.d.ts", @@ -19,7 +19,7 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-lib": "^0.5.25-alpha.16", + "@remix-project/remix-lib": "^0.5.25-alpha.17", "async": "^2.6.2", "eslint-scope": "^5.0.0", "ethers": "^5.4.2", @@ -57,5 +57,5 @@ }, "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-solidity#readme", "typings": "src/index.d.ts", - "gitHead": "c915b9ab496d9e6902eb8b747425f4d267d8dce3" + "gitHead": "4806543bb099b558872793ca7a215468e0bffc81" } \ No newline at end of file diff --git a/libs/remix-tests/package.json b/libs/remix-tests/package.json index 335b549771..cd92586fb8 100644 --- a/libs/remix-tests/package.json +++ b/libs/remix-tests/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-tests", - "version": "0.2.25-alpha.16", + "version": "0.2.25-alpha.17", "description": "Tool to test Solidity smart contracts", "main": "src/index.js", "types": "./src/index.d.ts", @@ -41,9 +41,9 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-lib": "^0.5.25-alpha.16", - "@remix-project/remix-simulator": "^0.2.25-alpha.16", - "@remix-project/remix-solidity": "^0.5.11-alpha.16", + "@remix-project/remix-lib": "^0.5.25-alpha.17", + "@remix-project/remix-simulator": "^0.2.25-alpha.17", + "@remix-project/remix-solidity": "^0.5.11-alpha.17", "@remix-project/remix-url-resolver": "^0.0.42", "ansi-gray": "^0.1.1", "async": "^2.6.0", @@ -78,5 +78,5 @@ "typescript": "^3.3.1" }, "typings": "src/index.d.ts", - "gitHead": "c915b9ab496d9e6902eb8b747425f4d267d8dce3" + "gitHead": "4806543bb099b558872793ca7a215468e0bffc81" } \ No newline at end of file diff --git a/libs/remix-tests/src/run.ts b/libs/remix-tests/src/run.ts index 52c5247290..0b64f1de1b 100644 --- a/libs/remix-tests/src/run.ts +++ b/libs/remix-tests/src/run.ts @@ -55,6 +55,7 @@ commander .option('-f, --fork ', 'set hard fork (e.g: istanbul, berlin etc. See full list of hard forks here: https://github.com/ethereumjs/ethereumjs-monorepo/tree/master/packages/common/src/hardforks)') .option('-n, --nodeUrl ', 'set node url (e.g: https://mainnet.infura.io/v3/your-api-key)') .option('-b, --blockNumber ', 'set block number (e.g: 123456)') + .option('-k, --killProcess ', 'enable/disable process exit with code 1 if there are failing tests.') .argument('file_path', 'path to test file or directory') .action(async (file_path) => { const options = commander.opts(); @@ -133,7 +134,7 @@ commander extend(web3) runTestFiles(path.resolve(file_path), isDirectory, web3, compilerConfig, (error, totalPassing, totalFailing) => { if (error) process.exit(1) - if (totalFailing > 0) process.exit(1) + if (totalFailing > 0 && options.killProcess) process.exit(1) }) }) @@ -141,5 +142,4 @@ if (!process.argv.slice(2).length) { log.error('Please specify a file or directory path') process.exit(1) } - commander.parse(process.argv) diff --git a/libs/remix-tests/tests/testRunner.cli.spec.ts b/libs/remix-tests/tests/testRunner.cli.spec.ts index e5d770e059..16bd565cce 100644 --- a/libs/remix-tests/tests/testRunner.cli.spec.ts +++ b/libs/remix-tests/tests/testRunner.cli.spec.ts @@ -68,7 +68,6 @@ Commands: expect(res.stdout.toString().trim()).to.match(/AssertOkTest okPassTest/) // check if console.log is printed expect(res.stdout.toString().trim()).to.match(/Ok pass test/) expect(res.stdout.toString().trim()).to.match(/AssertOkTest okFailTest/) // check if console.log is printed - console.log('output: ', res.stdout.toString().trim()) expect(res.stdout.toString().trim()).to.match(/Ok fail test/) // match fail test details expect(res.stdout.toString().trim()).to.match(/Expected value should be ok to: true/) diff --git a/libs/remix-ui/helper/src/lib/components/custom-tooltip.tsx b/libs/remix-ui/helper/src/lib/components/custom-tooltip.tsx index 6c55ed06c8..c322d2f924 100644 --- a/libs/remix-ui/helper/src/lib/components/custom-tooltip.tsx +++ b/libs/remix-ui/helper/src/lib/components/custom-tooltip.tsx @@ -11,11 +11,12 @@ export function CustomTooltip({ children, placement, tooltipId, tooltipClasses, + {typeof tooltipText === 'string' ? ({tooltipText}) : (tooltipText)} } delay={delay} + show={true} > {children} diff --git a/libs/remix-url-resolver/package.json b/libs/remix-url-resolver/package.json index f5be3dc49c..3d20660020 100644 --- a/libs/remix-url-resolver/package.json +++ b/libs/remix-url-resolver/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-url-resolver", - "version": "0.0.47-alpha.16", + "version": "0.0.47-alpha.17", "description": "Solidity import url resolver engine", "main": "src/index.js", "types": "src/index.d.ts", @@ -40,5 +40,5 @@ "typescript": "^3.1.6" }, "typings": "src/index.d.ts", - "gitHead": "c915b9ab496d9e6902eb8b747425f4d267d8dce3" + "gitHead": "4806543bb099b558872793ca7a215468e0bffc81" } \ No newline at end of file diff --git a/libs/remix-ws-templates/package.json b/libs/remix-ws-templates/package.json index 5ace0de2dd..07e9a42c53 100644 --- a/libs/remix-ws-templates/package.json +++ b/libs/remix-ws-templates/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-ws-templates", - "version": "1.0.12-alpha.16", + "version": "1.0.12-alpha.17", "description": "Create a Remix IDE workspace using different templates", "main": "src/index.js", "types": "src/index.d.ts", @@ -24,5 +24,5 @@ "ethers": "^5.4.2", "web3": "^1.5.1" }, - "gitHead": "c915b9ab496d9e6902eb8b747425f4d267d8dce3" + "gitHead": "4806543bb099b558872793ca7a215468e0bffc81" } \ No newline at end of file