hardhat 3.0.16 → 3.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +22 -0
- package/dist/src/internal/builtin-plugins/network-manager/network-manager.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/network-manager.js +42 -29
- package/dist/src/internal/builtin-plugins/network-manager/network-manager.js.map +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/type-extensions/config.d.ts +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/type-extensions/config.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/node/task-action.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/node/task-action.js +5 -5
- package/dist/src/internal/builtin-plugins/node/task-action.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/downloader.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/downloader.js +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/downloader.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/index.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/index.js +7 -0
- package/dist/src/internal/builtin-plugins/solidity-test/index.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/reporter.d.ts +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/reporter.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/reporter.js +47 -26
- package/dist/src/internal/builtin-plugins/solidity-test/reporter.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/task-action.d.ts +1 -0
- package/dist/src/internal/builtin-plugins/solidity-test/task-action.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/task-action.js +26 -2
- package/dist/src/internal/builtin-plugins/solidity-test/task-action.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/types.d.ts +6 -1
- package/dist/src/internal/builtin-plugins/solidity-test/types.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/test/task-action.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/test/task-action.js +90 -1
- package/dist/src/internal/builtin-plugins/test/task-action.js.map +1 -1
- package/dist/src/internal/core/arguments.d.ts.map +1 -1
- package/dist/src/internal/core/arguments.js +4 -6
- package/dist/src/internal/core/arguments.js.map +1 -1
- package/package.json +4 -4
- package/src/internal/builtin-plugins/network-manager/network-manager.ts +56 -38
- package/src/internal/builtin-plugins/network-manager/type-extensions/config.ts +1 -1
- package/src/internal/builtin-plugins/node/task-action.ts +11 -5
- package/src/internal/builtin-plugins/solidity/build-system/compiler/downloader.ts +4 -1
- package/src/internal/builtin-plugins/solidity-test/index.ts +8 -0
- package/src/internal/builtin-plugins/solidity-test/reporter.ts +61 -25
- package/src/internal/builtin-plugins/solidity-test/task-action.ts +34 -4
- package/src/internal/builtin-plugins/solidity-test/types.ts +10 -1
- package/src/internal/builtin-plugins/test/task-action.ts +121 -1
- package/src/internal/core/arguments.ts +4 -6
- package/templates/hardhat-2/03-mocha-ethers-ts/package.json +1 -1
- package/templates/hardhat-2/04-mocha-viem-ts/package.json +1 -1
- package/templates/hardhat-3/01-node-test-runner-viem/package.json +6 -6
- package/templates/hardhat-3/02-mocha-ethers/package.json +8 -8
- package/templates/hardhat-3/03-minimal/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
# hardhat
|
|
2
2
|
|
|
3
|
+
## 3.1.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- 7b851f3: Bumped EDR version to [`0.12.0-next.17`](https://www.npmjs.com/package/@nomicfoundation/edr/v/0.12.0-next.17)
|
|
8
|
+
- Changed default L1 hardfork to Osaka
|
|
9
|
+
- Changed default OP stack hardfork to Isthmus
|
|
10
|
+
- Fixed default transaction gas limit for post-Osaka hardforks in OP stack and generic chains
|
|
11
|
+
|
|
12
|
+
### Patch Changes
|
|
13
|
+
|
|
14
|
+
- 7697451: Test summaries are now merged when running multiple test tasks ([#7053](https://github.com/NomicFoundation/hardhat/issues/7053))
|
|
15
|
+
- a3bf244: Fixed the download of solc, which broke for v0.8.31
|
|
16
|
+
|
|
17
|
+
## 3.0.17
|
|
18
|
+
|
|
19
|
+
### Patch Changes
|
|
20
|
+
|
|
21
|
+
- 9f4020b: - Update template projects to ignore local `.env` files but still allow committing `.env.example` files, thanks @KonstantinosChonas! ([7702](https://github.com/NomicFoundation/hardhat/issues/7702))
|
|
22
|
+
- a9a47e5: Fixed hex validation patterns, thanks @Bilogweb3 ([#7719](https://github.com/NomicFoundation/hardhat/pull/7719))
|
|
23
|
+
- b0f37e1: Fixed the network config to re-validate and re-resolve `chainType` on `connect()` ([#7700](https://github.com/NomicFoundation/hardhat/issues/7700)).
|
|
24
|
+
|
|
3
25
|
## 3.0.16
|
|
4
26
|
|
|
5
27
|
### Patch Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network-manager.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/network-manager/network-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EACV,sBAAsB,EACtB,iBAAiB,EACjB,aAAa,EAEd,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EACjB,uBAAuB,EACvB,cAAc,EACf,MAAM,2BAA2B,CAAC;AAEnC,OAAO,KAAK,EAEV,cAAc,EACd,eAAe,EAChB,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"network-manager.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/network-manager/network-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EACV,sBAAsB,EACtB,iBAAiB,EACjB,aAAa,EAEd,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EACjB,uBAAuB,EACvB,cAAc,EACf,MAAM,2BAA2B,CAAC;AAEnC,OAAO,KAAK,EAEV,cAAc,EACd,eAAe,EAChB,MAAM,6BAA6B,CAAC;AAoBrC,MAAM,MAAM,6BAA6B,GAAG,CAC1C,OAAO,EAAE,cAAc,EACvB,eAAe,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,OAAO,CAAC,eAAe,CAAC,KAC7D,OAAO,CAAC,eAAe,CAAC,CAAC;AAE9B,qBAAa,4BAA6B,YAAW,cAAc;;gBAc/D,cAAc,EAAE,MAAM,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,EAC7C,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,eAAe,EACjC,UAAU,EAAE,iBAAiB,EAC7B,gBAAgB,EAAE,sBAAsB,EACxC,sBAAsB,EAAE,MAAM,GAAG,SAAS,EAC1C,WAAW,EAAE,MAAM;IAaR,OAAO,CAClB,UAAU,SAAS,SAAS,GAAG,MAAM,GAAG,gBAAgB,EAExD,eAAe,CAAC,EAAE,uBAAuB,CAAC,UAAU,CAAC,GAAG,MAAM,GAC7D,OAAO,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;IA0B5B,YAAY,CACvB,eAAe,GAAE,uBAAuB,GAAG,MAAkB,EAC7D,SAAS,CAAC,EAAE,MAAM,EAClB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,aAAa,CAAC;CAgU1B"}
|
|
@@ -5,6 +5,7 @@ import { resolveUserConfigToHardhatConfig } from "../../core/hre.js";
|
|
|
5
5
|
import { isSupportedChainType } from "../../edr/chain-type.js";
|
|
6
6
|
import { JsonRpcServerImplementation } from "../node/json-rpc/server.js";
|
|
7
7
|
import { EdrProvider } from "./edr/edr-provider.js";
|
|
8
|
+
import { getHardforks } from "./edr/types/hardfork.js";
|
|
8
9
|
import { edrGasReportToHardhatGasMeasurements } from "./edr/utils/convert-to-edr.js";
|
|
9
10
|
import { HttpProvider } from "./http-provider.js";
|
|
10
11
|
import { NetworkConnectionImplementation } from "./network-connection.js";
|
|
@@ -59,31 +60,20 @@ export class NetworkManagerImplementation {
|
|
|
59
60
|
}
|
|
60
61
|
async #initializeNetworkConnection(networkName, chainType, networkConfigOverride) {
|
|
61
62
|
const resolvedNetworkName = networkName ?? this.#defaultNetwork;
|
|
62
|
-
|
|
63
|
+
const existingNetworkConfig = this.#networkConfigs[resolvedNetworkName];
|
|
64
|
+
if (existingNetworkConfig === undefined) {
|
|
63
65
|
throw new HardhatError(HardhatError.ERRORS.CORE.NETWORK.NETWORK_NOT_FOUND, {
|
|
64
66
|
networkName: resolvedNetworkName,
|
|
65
67
|
});
|
|
66
68
|
}
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
69
|
+
/* eslint-disable-next-line @typescript-eslint/consistent-type-assertions --
|
|
70
|
+
* Type assertion is safe: defaultChainType ensures non-undefined, and the
|
|
71
|
+
* resolved value will be ChainTypeT (if provided) or a fallback that
|
|
72
|
+
* satisfies the ChainType | string constraint */
|
|
70
73
|
const resolvedChainType = (chainType ??
|
|
71
|
-
|
|
74
|
+
existingNetworkConfig.chainType ??
|
|
72
75
|
this.#defaultChainType);
|
|
73
|
-
|
|
74
|
-
* If resolvedNetworkConfig.chainType is defined, it must match the
|
|
75
|
-
* provided chainType.
|
|
76
|
-
* We use resolvedChainType as it will be either chainType or
|
|
77
|
-
* resolvedNetworkConfig.chainType in this context.
|
|
78
|
-
*/
|
|
79
|
-
if (resolvedNetworkConfig.chainType !== undefined &&
|
|
80
|
-
resolvedChainType !== resolvedNetworkConfig.chainType) {
|
|
81
|
-
throw new HardhatError(HardhatError.ERRORS.CORE.NETWORK.INVALID_CHAIN_TYPE, {
|
|
82
|
-
networkName: resolvedNetworkName,
|
|
83
|
-
chainType: resolvedChainType,
|
|
84
|
-
networkChainType: resolvedNetworkConfig.chainType,
|
|
85
|
-
});
|
|
86
|
-
}
|
|
76
|
+
const resolvedNetworkConfig = await this.#resolveNetworkConfig(resolvedNetworkName, networkConfigOverride, resolvedChainType);
|
|
87
77
|
/* Capture the hook manager in a local variable to avoid retaining a
|
|
88
78
|
reference to the NetworkManager instance, allowing the garbage collector
|
|
89
79
|
to clean up the NetworkConnectionImplementation instances properly. */
|
|
@@ -166,20 +156,30 @@ export class NetworkManagerImplementation {
|
|
|
166
156
|
* @returns a valid network configuration including any config additions from
|
|
167
157
|
* plugins
|
|
168
158
|
*/
|
|
169
|
-
async #resolveNetworkConfig(resolvedNetworkName, networkConfigOverride) {
|
|
170
|
-
|
|
171
|
-
|
|
159
|
+
async #resolveNetworkConfig(resolvedNetworkName, networkConfigOverride = {}, resolvedChainType) {
|
|
160
|
+
const existingNetworkConfig = this.#networkConfigs[resolvedNetworkName];
|
|
161
|
+
if (Object.keys(networkConfigOverride).length === 0 &&
|
|
162
|
+
resolvedChainType === existingNetworkConfig.chainType) {
|
|
163
|
+
return existingNetworkConfig;
|
|
172
164
|
}
|
|
173
165
|
if ("type" in networkConfigOverride &&
|
|
174
|
-
networkConfigOverride.type !==
|
|
175
|
-
this.#networkConfigs[resolvedNetworkName].type) {
|
|
166
|
+
networkConfigOverride.type !== existingNetworkConfig.type) {
|
|
176
167
|
throw new HardhatError(HardhatError.ERRORS.CORE.NETWORK.INVALID_CONFIG_OVERRIDE, {
|
|
177
168
|
errors: `\t* The type of the network cannot be changed.`,
|
|
178
169
|
});
|
|
179
170
|
}
|
|
180
|
-
|
|
171
|
+
if ("chainType" in networkConfigOverride &&
|
|
172
|
+
networkConfigOverride.chainType !== existingNetworkConfig.chainType) {
|
|
173
|
+
throw new HardhatError(HardhatError.ERRORS.CORE.NETWORK.INVALID_CONFIG_OVERRIDE, {
|
|
174
|
+
errors: `\t* The chainType cannot be specified in config overrides. Pass it at the top level instead: hre.network.connect({ chainType: 'op' })`,
|
|
175
|
+
});
|
|
176
|
+
}
|
|
177
|
+
const userConfigWithOverrides = deepMerge(this.#userConfig, {
|
|
181
178
|
networks: {
|
|
182
|
-
[resolvedNetworkName]:
|
|
179
|
+
[resolvedNetworkName]: {
|
|
180
|
+
...networkConfigOverride,
|
|
181
|
+
chainType: resolvedChainType,
|
|
182
|
+
},
|
|
183
183
|
},
|
|
184
184
|
});
|
|
185
185
|
// This is safe, the plugins used in resolution are registered
|
|
@@ -187,15 +187,28 @@ export class NetworkManagerImplementation {
|
|
|
187
187
|
// ensuring the original plugins are available at the end
|
|
188
188
|
// of resolution.
|
|
189
189
|
const resolvedPlugins = [];
|
|
190
|
-
const configResolutionResult = await resolveUserConfigToHardhatConfig(
|
|
190
|
+
const configResolutionResult = await resolveUserConfigToHardhatConfig(userConfigWithOverrides, this.#hookManager, this.#projectRoot, this.#userProvidedConfigPath, resolvedPlugins);
|
|
191
191
|
if (!configResolutionResult.success) {
|
|
192
192
|
throw new HardhatError(HardhatError.ERRORS.CORE.NETWORK.INVALID_CONFIG_OVERRIDE, {
|
|
193
193
|
errors: `\t${configResolutionResult.userConfigValidationErrors
|
|
194
194
|
.map((error) => {
|
|
195
195
|
const path = this.#normaliseErrorPathToNetworkConfig(error.path, resolvedNetworkName);
|
|
196
|
+
let errorMessage = error.message;
|
|
197
|
+
// When chainType is changed but the network has a configured hardfork,
|
|
198
|
+
// provide a specific message explaining the hardfork must also be updated
|
|
199
|
+
if (path[0] === "hardfork") {
|
|
200
|
+
errorMessage =
|
|
201
|
+
`Your configured hardfork is incompatible with chainType ${resolvedChainType}. ` +
|
|
202
|
+
`You need to update the hardfork in your network config or pass a valid hardfork ` +
|
|
203
|
+
`in the overrides when connecting to the network. ` +
|
|
204
|
+
`Valid hardforks for chainType ${resolvedChainType} are: ` +
|
|
205
|
+
/* eslint-disable-next-line @typescript-eslint/consistent-type-assertions
|
|
206
|
+
-- We know resolvedChainType is a valid ChainType */
|
|
207
|
+
`${getHardforks(resolvedChainType).join(", ")}.`;
|
|
208
|
+
}
|
|
196
209
|
return path.length > 0
|
|
197
|
-
? `* Error in ${path.join(".")}: ${
|
|
198
|
-
: `* ${
|
|
210
|
+
? `* Error in ${path.join(".")}: ${errorMessage}`
|
|
211
|
+
: `* ${errorMessage}`;
|
|
199
212
|
})
|
|
200
213
|
.join("\n\t")}`,
|
|
201
214
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network-manager.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/network-manager/network-manager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"network-manager.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/network-manager/network-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,7 @@ declare module "../../../../types/config.js" {
|
|
|
42
42
|
}
|
|
43
43
|
type NetworkUserConfig = HttpNetworkUserConfig | EdrNetworkUserConfig;
|
|
44
44
|
type HttpNetworkConfigOverride = Partial<Omit<HttpNetworkUserConfig, "type">>;
|
|
45
|
-
type EdrNetworkConfigOverride = Partial<Omit<EdrNetworkUserConfig, "type">>;
|
|
45
|
+
type EdrNetworkConfigOverride = Partial<Omit<EdrNetworkUserConfig, "type" | "chainType">>;
|
|
46
46
|
type NetworkConfigOverride = HttpNetworkConfigOverride | EdrNetworkConfigOverride;
|
|
47
47
|
interface HttpNetworkUserConfig {
|
|
48
48
|
type: "http";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/network-manager/type-extensions/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhF,OAAO,6BAA6B,CAAC;AACrC,OAAO,QAAQ,6BAA6B,CAAC;IAC3C,UAAiB,iBAAiB;QAChC,gBAAgB,CAAC,EAAE,0BAA0B,CAAC;QAC9C,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;KAC9C;IAED,UAAiB,0BAA0B;QACzC,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,yBAAyB,CAAC;KACvD;IAED,UAAiB,yBAAyB;QACxC,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,CAAC,EAAE,SAAS,CAAC;QACtB,eAAe,CAAC,EAAE,yBAAyB,CAAC;QAC5C,cAAc,CAAC,EAAE,wBAAwB,CAAC;KAC3C;IAED,UAAiB,yBAAyB;QACxC,CAAC,YAAY,EAAE,MAAM,GACjB,+BAA+B,GAC/B,6BAA6B,CAAC;KACnC;IAED,UAAiB,+BAA+B;QAC9C,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,KAAK,CAAC;KACnB;IAED,UAAiB,6BAA6B;QAC5C,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,KAAK,CAAC;KACrB;IAED,UAAiB,wBAAwB;QACvC,SAAS,CAAC,EAAE,gCAAgC,CAAC;QAC7C,UAAU,CAAC,EAAE,iCAAiC,CAAC;KAChD;IAED,UAAiB,gCAAgC;QAC/C,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB;IAED,UAAiB,iCAAiC;QAChD,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB;IAED,KAAY,iBAAiB,GAAG,qBAAqB,GAAG,oBAAoB,CAAC;IAE7E,KAAY,yBAAyB,GAAG,OAAO,CAC7C,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC,CACpC,CAAC;IAEF,KAAY,wBAAwB,GAAG,OAAO,CAC5C,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/network-manager/type-extensions/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-action.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/node/task-action.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"task-action.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/node/task-action.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AA0BrE,UAAU,mBAAmB;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,QAAA,MAAM,UAAU,EAAE,qBAAqB,CAAC,mBAAmB,CAyI1D,CAAC;AAEF,eAAe,UAAU,CAAC"}
|
|
@@ -26,6 +26,9 @@ const nodeAction = async (args, hre) => {
|
|
|
26
26
|
networkName: network,
|
|
27
27
|
});
|
|
28
28
|
}
|
|
29
|
+
const connectionParams = {
|
|
30
|
+
network,
|
|
31
|
+
};
|
|
29
32
|
// NOTE: We create an empty network config override here. We add to it based
|
|
30
33
|
// on the result of arguments parsing. We can expand the list of arguments
|
|
31
34
|
// as much as needed.
|
|
@@ -38,7 +41,7 @@ const nodeAction = async (args, hre) => {
|
|
|
38
41
|
name: "chainType",
|
|
39
42
|
});
|
|
40
43
|
}
|
|
41
|
-
|
|
44
|
+
connectionParams.chainType = args.chainType;
|
|
42
45
|
}
|
|
43
46
|
if (args.chainId !== -1) {
|
|
44
47
|
networkConfigOverride.chainId = args.chainId;
|
|
@@ -61,10 +64,7 @@ const nodeAction = async (args, hre) => {
|
|
|
61
64
|
}
|
|
62
65
|
// NOTE: This is where we initialize the network; the connect method returns
|
|
63
66
|
// a fully resolved networkConfig object which might be useful for display
|
|
64
|
-
const { networkConfig, provider } = await hre.network.connect(
|
|
65
|
-
network,
|
|
66
|
-
override: networkConfigOverride,
|
|
67
|
-
});
|
|
67
|
+
const { networkConfig, provider } = await hre.network.connect(connectionParams);
|
|
68
68
|
assertHardhatInvariant(provider instanceof EdrProvider, "Provider must be EdrProvider, since only edr networks are supported");
|
|
69
69
|
// NOTE: We enable logging for the node
|
|
70
70
|
await provider.request({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-action.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/node/task-action.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"task-action.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/node/task-action.ts"],"names":[],"mappings":"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"}
|
package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/downloader.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"downloader.d.ts","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/solidity/build-system/compiler/downloader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAyB9C,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAelE,oBAAY,gBAAgB;IAC1B,KAAK,gBAAgB;IACrB,WAAW,kBAAkB;IAC7B,OAAO,kBAAkB;IACzB,KAAK,iBAAiB;IACtB,IAAI,SAAS;CACd;
|
|
1
|
+
{"version":3,"file":"downloader.d.ts","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/solidity/build-system/compiler/downloader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAyB9C,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAelE,oBAAY,gBAAgB;IAC1B,KAAK,gBAAgB;IACrB,WAAW,kBAAkB;IAC7B,OAAO,kBAAkB;IACzB,KAAK,iBAAiB;IACtB,IAAI,SAAS;CACd;AAgBD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,0BAA0B,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjE;;;;OAIG;IACH,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAExD;;;;;;OAMG;IACH,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpD;;;;;;OAMG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC;CAC7D;AAED;;GAEG;AACH,qBAAa,gCAAiC,YAAW,kBAAkB;;WAC3D,mBAAmB,IAAI,gBAAgB;IAoCrD;;OAEG;gBAED,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,MAAM,EACpB,gBAAgB,GAAE,OAAO,QAAmB;IAOjC,0BAA0B,CACrC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,GACpB,OAAO,CAAC,IAAI,CAAC;IAoBH,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAQvD,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA2CnD,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;CA6NzE"}
|
|
@@ -136,7 +136,7 @@ export class CompilerDownloaderImplementation {
|
|
|
136
136
|
const listPath = this.#getCompilerListPath();
|
|
137
137
|
assertHardhatInvariant(await exists(listPath), `Trying to get the compiler list for ${this.#platform} before it was downloaded`);
|
|
138
138
|
const list = await this.#readCompilerList(listPath);
|
|
139
|
-
const build = list.builds.find((b) => b.version === version);
|
|
139
|
+
const build = list.builds.find((b) => b.version === version && b.prerelease === undefined);
|
|
140
140
|
if (build === undefined) {
|
|
141
141
|
throw new HardhatError(HardhatError.ERRORS.CORE.SOLIDITY.INVALID_SOLC_VERSION, {
|
|
142
142
|
version,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"downloader.js","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/solidity/build-system/compiler/downloader.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EACL,YAAY,EACZ,sBAAsB,GACvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EACL,KAAK,EACL,UAAU,EACV,SAAS,EACT,MAAM,EACN,cAAc,EACd,YAAY,EACZ,MAAM,EACN,aAAa,GACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnF,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/D,MAAM,GAAG,GAAG,KAAK,CAAC,6BAA6B,CAAC,CAAC;AAEjD,MAAM,uBAAuB,GAAG,mCAAmC,CAAC;AAEpE,yEAAyE;AACzE,kCAAkC;AAClC,MAAM,0BAA0B,GAC9B,2DAA2D,CAAC;AAE9D,MAAM,CAAN,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC1B,yCAAqB,CAAA;IACrB,iDAA6B,CAAA;IAC7B,6CAAyB,CAAA;IACzB,0CAAsB,CAAA;IACtB,iCAAa,CAAA;AACf,CAAC,EANW,gBAAgB,KAAhB,gBAAgB,QAM3B;
|
|
1
|
+
{"version":3,"file":"downloader.js","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/solidity/build-system/compiler/downloader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAO/D,OAAO,sBAAsB,CAAC;AAE9B,QAAA,MAAM,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAO/D,OAAO,sBAAsB,CAAC;AAE9B,QAAA,MAAM,aAAa,EAAE,aAoDpB,CAAC;AAEF,eAAe,aAAa,CAAC"}
|
|
@@ -35,6 +35,13 @@ const hardhatPlugin = {
|
|
|
35
35
|
shortName: "v",
|
|
36
36
|
description: "Verbosity level of the test output",
|
|
37
37
|
defaultValue: DEFAULT_VERBOSITY,
|
|
38
|
+
})
|
|
39
|
+
.addOption({
|
|
40
|
+
name: "testSummaryIndex",
|
|
41
|
+
description: "Print a summary of all test runners starting from the given index",
|
|
42
|
+
type: ArgumentType.INT,
|
|
43
|
+
defaultValue: 0,
|
|
44
|
+
hidden: true,
|
|
38
45
|
})
|
|
39
46
|
.setAction(async () => import("./task-action.js"))
|
|
40
47
|
.build(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,OAAO,sBAAsB,CAAC;AAE9B,MAAM,aAAa,GAAkB;IACnC,EAAE,EAAE,wBAAwB;IAC5B,YAAY,EAAE;QACZ,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,2BAA2B,CAAC;QACjD,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,yBAAyB,CAAC;KAC9C;IACD,KAAK,EAAE;QACL,IAAI,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,wBAAwB,CAAC;aACjD,mBAAmB,CAAC;YACnB,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,mCAAmC;YAChD,YAAY,EAAE,EAAE;SACjB,CAAC;aACD,SAAS,CAAC;YACT,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,uBAAuB;YACpC,YAAY,EAAE,IAAI;SACnB,CAAC;aACD,SAAS,CAAC;YACT,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,oDAAoD;YACjE,IAAI,EAAE,YAAY,CAAC,sBAAsB;YACzC,YAAY,EAAE,SAAS;SACxB,CAAC;aACD,OAAO,CAAC;YACP,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,oDAAoD;SAClE,CAAC;aACD,QAAQ,CAAC;YACR,IAAI,EAAE,WAAW;YACjB,SAAS,EAAE,GAAG;YACd,WAAW,EAAE,oCAAoC;YACjD,YAAY,EAAE,iBAAiB;SAChC,CAAC;aACD,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;aACjD,KAAK,EAAE;KACX;IACD,YAAY,EAAE,GAAG,EAAE,CAAC;QAClB,MAAM,CAAC,sBAAsB,CAAC;QAC9B,MAAM,CAAC,kBAAkB,CAAC;QAC1B,MAAM,CAAC,sBAAsB,CAAC;QAC9B,MAAM,CAAC,2BAA2B,CAAC;KACpC;IACD,UAAU,EAAE,SAAS;CACtB,CAAC;AAEF,eAAe,aAAa,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,OAAO,sBAAsB,CAAC;AAE9B,MAAM,aAAa,GAAkB;IACnC,EAAE,EAAE,wBAAwB;IAC5B,YAAY,EAAE;QACZ,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,2BAA2B,CAAC;QACjD,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,yBAAyB,CAAC;KAC9C;IACD,KAAK,EAAE;QACL,IAAI,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,wBAAwB,CAAC;aACjD,mBAAmB,CAAC;YACnB,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,mCAAmC;YAChD,YAAY,EAAE,EAAE;SACjB,CAAC;aACD,SAAS,CAAC;YACT,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,uBAAuB;YACpC,YAAY,EAAE,IAAI;SACnB,CAAC;aACD,SAAS,CAAC;YACT,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,oDAAoD;YACjE,IAAI,EAAE,YAAY,CAAC,sBAAsB;YACzC,YAAY,EAAE,SAAS;SACxB,CAAC;aACD,OAAO,CAAC;YACP,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,oDAAoD;SAClE,CAAC;aACD,QAAQ,CAAC;YACR,IAAI,EAAE,WAAW;YACjB,SAAS,EAAE,GAAG;YACd,WAAW,EAAE,oCAAoC;YACjD,YAAY,EAAE,iBAAiB;SAChC,CAAC;aACD,SAAS,CAAC;YACT,IAAI,EAAE,kBAAkB;YACxB,WAAW,EACT,mEAAmE;YACrE,IAAI,EAAE,YAAY,CAAC,GAAG;YACtB,YAAY,EAAE,CAAC;YACf,MAAM,EAAE,IAAI;SACb,CAAC;aACD,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;aACjD,KAAK,EAAE;KACX;IACD,YAAY,EAAE,GAAG,EAAE,CAAC;QAClB,MAAM,CAAC,sBAAsB,CAAC;QAC9B,MAAM,CAAC,kBAAkB,CAAC;QAC1B,MAAM,CAAC,sBAAsB,CAAC;QAC9B,MAAM,CAAC,2BAA2B,CAAC;KACpC;IACD,UAAU,EAAE,SAAS;CACtB,CAAC;AAEF,eAAe,aAAa,CAAC"}
|
|
@@ -5,5 +5,5 @@ import { type Colorizer } from "./formatters.js";
|
|
|
5
5
|
* solidity test runner's test stream. It was based on the hardhat node test
|
|
6
6
|
* reporter's design.
|
|
7
7
|
*/
|
|
8
|
-
export declare function testReporter(source: TestEventSource, sourceNameToUserSourceName: Map<string, string>, verbosity: number, colorizer?: Colorizer): TestReporterResult;
|
|
8
|
+
export declare function testReporter(source: TestEventSource, sourceNameToUserSourceName: Map<string, string>, verbosity: number, testSummaryIndex?: number, colorizer?: Colorizer): TestReporterResult;
|
|
9
9
|
//# sourceMappingURL=reporter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reporter.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/reporter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,kBAAkB,EAEnB,MAAM,YAAY,CAAC;AAUpB,OAAO,EACL,KAAK,SAAS,EAGf,MAAM,iBAAiB,CAAC;AA+BzB;;;;GAIG;AACH,wBAAuB,YAAY,CACjC,MAAM,EAAE,eAAe,EACvB,0BAA0B,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/C,SAAS,EAAE,MAAM,EACjB,SAAS,GAAE,SAAiB,GAC3B,kBAAkB,
|
|
1
|
+
{"version":3,"file":"reporter.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/reporter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,kBAAkB,EAEnB,MAAM,YAAY,CAAC;AAUpB,OAAO,EACL,KAAK,SAAS,EAGf,MAAM,iBAAiB,CAAC;AA+BzB;;;;GAIG;AACH,wBAAuB,YAAY,CACjC,MAAM,EAAE,eAAe,EACvB,0BAA0B,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/C,SAAS,EAAE,MAAM,EACjB,gBAAgB,GAAE,MAAU,EAC5B,SAAS,GAAE,SAAiB,GAC3B,kBAAkB,CA0TpB"}
|
|
@@ -29,9 +29,9 @@ class Indenter {
|
|
|
29
29
|
* solidity test runner's test stream. It was based on the hardhat node test
|
|
30
30
|
* reporter's design.
|
|
31
31
|
*/
|
|
32
|
-
export async function* testReporter(source, sourceNameToUserSourceName, verbosity, colorizer = chalk) {
|
|
32
|
+
export async function* testReporter(source, sourceNameToUserSourceName, verbosity, testSummaryIndex = 0, colorizer = chalk) {
|
|
33
33
|
let runSuccessCount = 0;
|
|
34
|
-
let runFailureCount = 0;
|
|
34
|
+
let runFailureCount = testSummaryIndex === 0 ? 1 : testSummaryIndex;
|
|
35
35
|
let runSkippedCount = 0;
|
|
36
36
|
const failures = [];
|
|
37
37
|
const indenter = new Indenter();
|
|
@@ -106,8 +106,8 @@ export async function* testReporter(source, sourceNameToUserSourceName, verbosit
|
|
|
106
106
|
}
|
|
107
107
|
case "Failure": {
|
|
108
108
|
failures.push({ testResult, formattedArtifactId });
|
|
109
|
-
runFailureCount++;
|
|
110
109
|
yield indenter.t `${colorizer.red(`${runFailureCount}) ${name}`)}\n`;
|
|
110
|
+
runFailureCount++;
|
|
111
111
|
if (verbosity >= 3) {
|
|
112
112
|
printExecutionTraces = true;
|
|
113
113
|
}
|
|
@@ -166,14 +166,18 @@ export async function* testReporter(source, sourceNameToUserSourceName, verbosit
|
|
|
166
166
|
}
|
|
167
167
|
}
|
|
168
168
|
}
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
yield
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
169
|
+
// testSummaryIndex of 0 means task is being run directly, so summary is handled here
|
|
170
|
+
// and not by the parent `test` task.
|
|
171
|
+
if (testSummaryIndex === 0) {
|
|
172
|
+
yield "\n";
|
|
173
|
+
yield "\n";
|
|
174
|
+
yield indenter.t `${colorizer.green(`${runSuccessCount} passing`)}\n`;
|
|
175
|
+
if (failures.length > 0) {
|
|
176
|
+
yield indenter.t `${colorizer.red(`${failures.length} failing`)}\n`;
|
|
177
|
+
}
|
|
178
|
+
if (runSkippedCount > 0) {
|
|
179
|
+
yield indenter.t `${colorizer.cyan(`${runSkippedCount} skipped`)}\n`;
|
|
180
|
+
}
|
|
177
181
|
}
|
|
178
182
|
const failuresByArtifactId = new Map();
|
|
179
183
|
for (const { testResult, formattedArtifactId } of failures) {
|
|
@@ -181,24 +185,33 @@ export async function* testReporter(source, sourceNameToUserSourceName, verbosit
|
|
|
181
185
|
artifactFailures.push(testResult);
|
|
182
186
|
failuresByArtifactId.set(formattedArtifactId, artifactFailures);
|
|
183
187
|
}
|
|
188
|
+
let failureOutput = "";
|
|
184
189
|
let failureIndex = 1;
|
|
185
190
|
if (failures.length > 0) {
|
|
186
|
-
|
|
191
|
+
function* output(str) {
|
|
192
|
+
if (testSummaryIndex === 0) {
|
|
193
|
+
yield str;
|
|
194
|
+
}
|
|
195
|
+
else {
|
|
196
|
+
failureOutput += str;
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
yield* output("\n");
|
|
187
200
|
let firstSuiteWithFailures = true;
|
|
188
201
|
for (const [artifactId, artifactFailures] of failuresByArtifactId) {
|
|
189
202
|
if (!firstSuiteWithFailures) {
|
|
190
|
-
yield "\n";
|
|
203
|
+
yield* output("\n");
|
|
191
204
|
}
|
|
192
205
|
firstSuiteWithFailures = false;
|
|
193
|
-
yield indenter.t `${artifactId}\n
|
|
206
|
+
yield* output(indenter.t `${artifactId}\n`);
|
|
194
207
|
indenter.inc();
|
|
195
208
|
let firstFailure = true;
|
|
196
209
|
for (const failure of artifactFailures) {
|
|
197
210
|
if (!firstFailure) {
|
|
198
|
-
yield "\n";
|
|
211
|
+
yield* output("\n");
|
|
199
212
|
}
|
|
200
213
|
firstFailure = false;
|
|
201
|
-
yield indenter.t `${failureIndex}) ${failure.name}\n
|
|
214
|
+
yield* output(indenter.t `${failureIndex}) ${failure.name}\n`);
|
|
202
215
|
failureIndex++;
|
|
203
216
|
indenter.inc();
|
|
204
217
|
const stackTrace = failure.stackTrace();
|
|
@@ -212,7 +225,7 @@ export async function* testReporter(source, sourceNameToUserSourceName, verbosit
|
|
|
212
225
|
? "FFI is disabled; set `test.solidity.ffi` to `true` in your Hardhat config to allow tests to call external commands"
|
|
213
226
|
: failure.reason ?? "Unknown error";
|
|
214
227
|
}
|
|
215
|
-
yield indenter.t `${colorizer.red(`Error: ${reason}`)}\n
|
|
228
|
+
yield* output(indenter.t `${colorizer.red(`Error: ${reason}`)}\n`);
|
|
216
229
|
// eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- Ignore Cases not matched: undefined
|
|
217
230
|
switch (stackTrace?.kind) {
|
|
218
231
|
case "StackTrace":
|
|
@@ -226,22 +239,22 @@ export async function* testReporter(source, sourceNameToUserSourceName, verbosit
|
|
|
226
239
|
}
|
|
227
240
|
}
|
|
228
241
|
if (stackTraceStack.length > 0) {
|
|
229
|
-
yield `${colorizer.grey(stackTraceStack.join("\n"))}\n
|
|
242
|
+
yield* output(`${colorizer.grey(stackTraceStack.join("\n"))}\n`);
|
|
230
243
|
}
|
|
231
|
-
yield "\n";
|
|
244
|
+
yield* output("\n");
|
|
232
245
|
break;
|
|
233
246
|
case "UnexpectedError":
|
|
234
247
|
await sendErrorTelemetry(new SolidityTestStackTraceGenerationError(stackTrace.errorMessage));
|
|
235
|
-
yield indenter.t `Stack Trace Warning: ${colorizer.grey(stackTrace.errorMessage)}\n
|
|
248
|
+
yield* output(indenter.t `Stack Trace Warning: ${colorizer.grey(stackTrace.errorMessage)}\n`);
|
|
236
249
|
break;
|
|
237
250
|
case "UnsafeToReplay":
|
|
238
251
|
if (stackTrace.globalForkLatest === true) {
|
|
239
|
-
yield indenter.t `Stack Trace Warning: ${colorizer.grey("The test is not safe to replay because a fork url without a fork block number was provided.")}\n
|
|
240
|
-
yield indenter.t `Try rerunning your tests with -vvv or above.\n
|
|
252
|
+
yield* output(indenter.t `Stack Trace Warning: ${colorizer.grey("The test is not safe to replay because a fork url without a fork block number was provided.")}\n`);
|
|
253
|
+
yield* output(indenter.t `Try rerunning your tests with -vvv or above.\n`);
|
|
241
254
|
}
|
|
242
255
|
if (stackTrace.impureCheatcodes.length > 0) {
|
|
243
|
-
yield indenter.t `Stack Trace Warning: ${colorizer.grey(`The test is not safe to replay because it uses impure cheatcodes: ${stackTrace.impureCheatcodes.join(", ")}`)}\n
|
|
244
|
-
yield indenter.t `Try rerunning your tests with -vvv or above.\n
|
|
256
|
+
yield* output(indenter.t `Stack Trace Warning: ${colorizer.grey(`The test is not safe to replay because it uses impure cheatcodes: ${stackTrace.impureCheatcodes.join(", ")}`)}\n`);
|
|
257
|
+
yield* output(indenter.t `Try rerunning your tests with -vvv or above.\n`);
|
|
245
258
|
}
|
|
246
259
|
break;
|
|
247
260
|
case "HeuristicFailed":
|
|
@@ -254,11 +267,11 @@ export async function* testReporter(source, sourceNameToUserSourceName, verbosit
|
|
|
254
267
|
? failure.counterexample.sequence
|
|
255
268
|
: [failure.counterexample];
|
|
256
269
|
for (const counterexample of counterexamples) {
|
|
257
|
-
yield indenter.t `Counterexample:\n
|
|
270
|
+
yield* output(indenter.t `Counterexample:\n`);
|
|
258
271
|
indenter.inc();
|
|
259
272
|
for (const [key, value] of Object.entries(counterexample)) {
|
|
260
273
|
const counterExampleDetails = `${key}: ${Buffer.isBuffer(value) ? bytesToHexString(value) : value}`;
|
|
261
|
-
yield indenter.t `${colorizer.grey(counterExampleDetails)}\n
|
|
274
|
+
yield* output(indenter.t `${colorizer.grey(counterExampleDetails)}\n`);
|
|
262
275
|
}
|
|
263
276
|
indenter.dec();
|
|
264
277
|
}
|
|
@@ -268,5 +281,13 @@ export async function* testReporter(source, sourceNameToUserSourceName, verbosit
|
|
|
268
281
|
indenter.dec();
|
|
269
282
|
}
|
|
270
283
|
}
|
|
284
|
+
if (testSummaryIndex > 0) {
|
|
285
|
+
yield {
|
|
286
|
+
failed: failures.length,
|
|
287
|
+
passed: runSuccessCount,
|
|
288
|
+
skipped: runSkippedCount,
|
|
289
|
+
failureOutput,
|
|
290
|
+
};
|
|
291
|
+
}
|
|
271
292
|
}
|
|
272
293
|
//# sourceMappingURL=reporter.js.map
|