github/hardhat-zkit
1
1
Fork 0
mirror of https://github.com/dl-solarity/hardhat-zkit.git synced 2026-01-10 08:18:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix node22 tests

Browse Source
This commit is contained in:
Artem Chystiakov
2025-08-29 13:53:49 +03:00
parent 16918a076d
commit 67bb25cea8
16 changed files with 81 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -1,4 +1,4 @@
ARG NODE_VERSION=20
ARG NODE_VERSION=22
FROM node:${NODE_VERSION} AS base
WORKDIR /hardhat-zkit

6
test/integration/setup/config.ts
View File

@@ -2,11 +2,11 @@ import { expect } from "chai";
import { extendConfig } from "hardhat/config";
import { useEnvironment } from "../../helpers";
import { useEnvironment } from "test-helpers";
import { zkitConfigExtender } from "@src/config/config";
import { zkitConfigExtender } from "src/config/config";
import { ZKitConfig } from "@src/types/zkit-config";
import { ZKitConfig } from "src/types/zkit-config";
describe("config", () => {
describe("loading", () => {

17
test/integration/tasks.test.ts
View File

@@ -5,6 +5,7 @@ import { capitalize } from "lodash";
import { execSync } from "child_process";
import "@solarity/chai-zkit";
import { expect } from "chai";
import { before } from "mocha";
import { stub, SinonStub } from "sinon";
@@ -20,12 +21,12 @@ import {
TASK_GENERATE_VERIFIERS,
TASK_ZKIT_CLEAN,
ZKIT_SCOPE_NAME,
} from "@src/task-names";
import { CircuitsCompileCache, CircuitsSetupCache } from "@src/cache";
import { CompileCacheEntry, SetupCacheEntry } from "@src/types/cache";
} from "src/task-names";
import { CircuitsCompileCache, CircuitsSetupCache } from "src/cache";
import { CompileCacheEntry, SetupCacheEntry } from "src/types/cache";
import { cleanUp, useEnvironment } from "@test-helpers";
import { getNormalizedFullPath } from "@src/utils/path-utils";
import { cleanUp, useEnvironment } from "test-helpers";
import { getNormalizedFullPath } from "src/utils/path-utils";
import {
getCompileCacheEntry,
getSetupCacheEntry,
@@ -34,9 +35,9 @@ import {
updateTypesDir,
} from "../utils";
import { HardhatZKit } from "@src/types/hardhat-zkit";
import { BaseCircomCompilerFactory } from "@src/core";
import { CircomCompilerDownloader } from "@src/core/compiler/CircomCompilerDownloader";
import { HardhatZKit } from "src/types/hardhat-zkit";
import { BaseCircomCompilerFactory } from "src/core";
import { CircomCompilerDownloader } from "src/core/compiler/CircomCompilerDownloader";
describe("ZKit tasks", async function () {
const circuitNames = ["Multiplier2", "Multiplier3Arr"];

15
test/unit/cache/circuits-compile-cache.test.ts vendored
View File

@@ -2,17 +2,18 @@ import fsExtra from "fs-extra";
import { expect } from "chai";
import { useEnvironment } from "@test-helpers";
import { useEnvironment } from "test-helpers";
import { getCompileCacheEntry } from "../../utils";
import { getFileHash } from "@src/utils/utils";
import { getNormalizedFullPath } from "@src/utils/path-utils";
import { getFileHash } from "src/utils/utils";
import { getNormalizedFullPath } from "src/utils/path-utils";
import { defaultCompileFlags } from "../../constants";
import { CompileCacheEntry } from "@src/types/cache";
import { TASK_CIRCUITS_COMPILE, TASK_CIRCUITS_MAKE, ZKIT_SCOPE_NAME } from "@src/task-names";
import { CIRCUITS_COMPILE_CACHE_FILENAME, CIRCUIT_COMPILE_CACHE_VERSION } from "@src/constants";
import { CompileCacheEntry } from "src/types/cache";
import { TASK_CIRCUITS_COMPILE, TASK_CIRCUITS_MAKE, ZKIT_SCOPE_NAME } from "src/task-names";
import { CIRCUITS_COMPILE_CACHE_FILENAME, CIRCUIT_COMPILE_CACHE_VERSION } from "src/constants";
import { CircuitsCompileCache, createCircuitsCompileCache, resetCircuitsCompileCache } from "@src/cache";
import { CircuitsCompileCache, createCircuitsCompileCache, resetCircuitsCompileCache } from "src/cache";
describe("CircuitsCompileCache", () => {
describe("createEmpty", () => {

18
test/unit/cache/circuits-setup-cache.test.ts vendored
View File

@@ -2,17 +2,17 @@ import fsExtra from "fs-extra";
import { expect } from "chai";
import { getFileHash } from "@src/utils/utils";
import { getNormalizedFullPath } from "@src/utils/path-utils";
import { CircuitsSetupCache, createCircuitsSetupCache, resetCircuitsSetupCache } from "@src/cache";
import { TASK_CIRCUITS_MAKE, ZKIT_SCOPE_NAME } from "@src/task-names";
import { CIRCUITS_SETUP_CACHE_FILENAME, CIRCUIT_SETUP_CACHE_VERSION } from "@src/constants";
import { getFileHash } from "src/utils/utils";
import { getNormalizedFullPath } from "src/utils/path-utils";
import { CircuitsSetupCache, createCircuitsSetupCache, resetCircuitsSetupCache } from "src/cache";
import { TASK_CIRCUITS_MAKE, ZKIT_SCOPE_NAME } from "src/task-names";
import { CIRCUITS_SETUP_CACHE_FILENAME, CIRCUIT_SETUP_CACHE_VERSION } from "src/constants";
import { SetupContributionSettings } from "@src/types/core";
import { SetupCacheEntry } from "@src/types/cache";
import { CircuitArtifact } from "@src/types/artifacts/circuit-artifacts";
import { SetupContributionSettings } from "src/types/core";
import { SetupCacheEntry } from "src/types/cache";
import { CircuitArtifact } from "src/types/artifacts/circuit-artifacts";
import { useEnvironment } from "@test-helpers";
import { useEnvironment } from "test-helpers";
import { getSetupCacheEntry } from "../../utils";
import { defaultContributionSettings } from "../../constants";

12
test/unit/core/compile/circom-compiler-downloader.test.ts
View File

@@ -4,13 +4,13 @@ import fsExtra from "fs-extra";
import { spy } from "sinon";
import { expect } from "chai";
import { cleanUp, useEnvironment } from "@test-helpers";
import { getNormalizedFullPath } from "@src/utils/path-utils";
import { cleanUp, useEnvironment } from "test-helpers";
import { getNormalizedFullPath } from "src/utils/path-utils";
import { CompilerPlatformBinary } from "@src/types/core";
import { createReporter, Reporter } from "@src/reporter";
import { LATEST_SUPPORTED_CIRCOM_VERSION } from "@src/constants";
import { CircomCompilerDownloader } from "@src/core/compiler/CircomCompilerDownloader";
import { CompilerPlatformBinary } from "src/types/core";
import { createReporter, Reporter } from "src/reporter";
import { LATEST_SUPPORTED_CIRCOM_VERSION } from "src/constants";
import { CircomCompilerDownloader } from "src/core/compiler/CircomCompilerDownloader";
describe("CircomCompilerDownloader", () => {
createReporter(true);

12
test/unit/core/compile/circom-compiler-factory.test.ts
View File

@@ -6,21 +6,21 @@ import { expect } from "chai";
import { before } from "mocha";
import { stub, SinonStub } from "sinon";
import { useEnvironment } from "@test-helpers";
import { getNormalizedFullPath } from "@src/utils/path-utils";
import { CompilerPlatformBinary, ICircomCompiler } from "@src/types/core";
import { useEnvironment } from "test-helpers";
import { getNormalizedFullPath } from "src/utils/path-utils";
import { CompilerPlatformBinary, ICircomCompiler } from "src/types/core";
import {
BaseCircomCompilerFactory,
BinaryCircomCompiler,
CircomCompilerFactory,
createCircomCompilerFactory,
WASMCircomCompiler,
} from "@src/core";
} from "src/core";
import { CircomCompilerDownloader } from "@src/core/compiler/CircomCompilerDownloader";
import { CircomCompilerDownloader } from "src/core/compiler/CircomCompilerDownloader";
import { defaultCompileFlags } from "../../../constants";
import { LATEST_SUPPORTED_CIRCOM_VERSION } from "@src/constants";
import { LATEST_SUPPORTED_CIRCOM_VERSION } from "src/constants";
describe("CircomCompilerFactory", () => {
let nativeCompilerStub: SinonStub;

12
test/unit/core/compile/circom-compiler.test.ts
View File

@@ -3,13 +3,13 @@ import { execSync } from "child_process";
import { expect } from "chai";
import { useEnvironment } from "@test-helpers";
import { getNormalizedFullPath } from "@src/utils/path-utils";
import { CircomCompilerFactory, createCircomCompilerFactory, WASMCircomCompiler } from "@src/core";
import { useEnvironment } from "test-helpers";
import { LATEST_SUPPORTED_CIRCOM_VERSION, NODE_MODULES } from "@src/constants";
import { CompileFlags, CompilerPlatformBinary } from "@src/types/core";
import { CircomCompilerDownloader } from "@src/core/compiler/CircomCompilerDownloader";
import { getNormalizedFullPath } from "src/utils/path-utils";
import { CircomCompilerFactory, createCircomCompilerFactory, WASMCircomCompiler } from "src/core";
import { LATEST_SUPPORTED_CIRCOM_VERSION, NODE_MODULES } from "src/constants";
import { CompileFlags, CompilerPlatformBinary } from "src/types/core";
import { CircomCompilerDownloader } from "src/core/compiler/CircomCompilerDownloader";
describe("WASMCircomCompiler", () => {
const defaultCompileFlags: CompileFlags = {

17
test/unit/core/compile/compilation-files-resolver.test.ts
View File

@@ -6,15 +6,16 @@ import { TASK_COMPILE_SOLIDITY_READ_FILE as TASK_READ_FILE } from "hardhat/built
import { HardhatRuntimeEnvironment } from "hardhat/types";
import { getAllFilesMatching } from "hardhat/internal/util/fs-utils";
import { CompilationFilesResolverMock } from "./mock/CompilationFilesResolverMock";
import { useEnvironment } from "@test-helpers";
import { CircuitsCompileCache } from "@src/cache";
import { TASK_CIRCUITS_COMPILE, ZKIT_SCOPE_NAME } from "@src/task-names";
import { DependencyGraph, CircomFilesResolver, CircomFilesParser } from "@src/core";
import { getNormalizedFullPath } from "@src/utils/path-utils";
import { CIRCUITS_COMPILE_CACHE_FILENAME } from "@src/constants";
import { useEnvironment } from "test-helpers";
import { CircomResolvedFileInfo, CircomResolvedFile } from "@src/types/core";
import { CompilationFilesResolverMock } from "./mock/CompilationFilesResolverMock";
import { CircuitsCompileCache } from "src/cache";
import { TASK_CIRCUITS_COMPILE, ZKIT_SCOPE_NAME } from "src/task-names";
import { DependencyGraph, CircomFilesResolver, CircomFilesParser } from "src/core";
import { getNormalizedFullPath } from "src/utils/path-utils";
import { CIRCUITS_COMPILE_CACHE_FILENAME } from "src/constants";
import { CircomResolvedFileInfo, CircomResolvedFile } from "src/types/core";
describe("CompilationFilesResolver", () => {
function getCompilationFilesManagerMock(hre: HardhatRuntimeEnvironment): CompilationFilesResolverMock {

4
test/unit/core/compile/mock/CompilationFilesResolverMock.ts
View File

@@ -1,5 +1,5 @@
import { CircomFilesResolver, CompilationFilesResolver, DependencyGraph } from "@src/core";
import { CompileFlags, CircomResolvedFileInfo, CircomResolvedFile } from "@src/types/core";
import { CircomFilesResolver, CompilationFilesResolver, DependencyGraph } from "src/core";
import { CompileFlags, CircomResolvedFileInfo, CircomResolvedFile } from "src/types/core";
export class CompilationFilesResolverMock extends CompilationFilesResolver {
public filterResolvedFiles(

6
test/unit/core/compile/types-generation.test.ts
View File

@@ -4,10 +4,10 @@ import fsExtra from "fs-extra";
import { HardhatRuntimeEnvironment } from "hardhat/types";
import { useEnvironment } from "@test-helpers";
import { useEnvironment } from "test-helpers";
import { CircuitArtifact } from "../../../../src/types/artifacts/circuit-artifacts";
import { TASK_CIRCUITS_MAKE, ZKIT_SCOPE_NAME } from "../../../../src/task-names";
import { CircuitArtifact } from "src/types/artifacts/circuit-artifacts";
import { TASK_CIRCUITS_MAKE, ZKIT_SCOPE_NAME } from "src/task-names";
describe("Types Generation", () => {
describe("types generation:with duplicated main components", () => {

22
test/unit/core/dependencies/file-parser.test.ts
View File

@@ -1,18 +1,20 @@
import fs from "fs";
import { expect } from "chai";
import { getCircomParser, VariableContext } from "@distributedlab/circom-parser";
import { createNonCryptographicHashBasedIdentifier } from "hardhat/internal/util/hash";
import { useEnvironment } from "@test-helpers";
import { CircomFilesParser, CircomFilesVisitor, CircomTemplateInputsVisitor } from "@src/core";
import { TASK_CIRCUITS_COMPILE, ZKIT_SCOPE_NAME } from "@src/task-names";
import { getNormalizedFullPath } from "@src/utils/path-utils";
import { CIRCUITS_COMPILE_CACHE_FILENAME } from "@src/constants";
import { createCircuitsCompileCache } from "@src/cache";
import { createReporter } from "@src/reporter";
import { CircomResolvedFile, ResolvedFileData } from "@src/types/core";
import { getCircomParser, VariableContext } from "@distributedlab/circom-parser";
import { BaseCacheType } from "@src/types/cache/base-cache";
import { useEnvironment } from "test-helpers";
import { CircomFilesParser, CircomFilesVisitor, CircomTemplateInputsVisitor } from "src/core";
import { TASK_CIRCUITS_COMPILE, ZKIT_SCOPE_NAME } from "src/task-names";
import { getNormalizedFullPath } from "src/utils/path-utils";
import { CIRCUITS_COMPILE_CACHE_FILENAME } from "src/constants";
import { createCircuitsCompileCache } from "src/cache";
import { createReporter } from "src/reporter";
import { CircomResolvedFile, ResolvedFileData } from "src/types/core";
import { BaseCacheType } from "src/types/cache/base-cache";
describe("CircomFilesParser", () => {
describe("parse", () => {

4
test/unit/core/utils/ptau-downloader.test.ts
View File

@@ -1,8 +1,8 @@
import fsExtra from "fs-extra";
import { expect } from "chai";
import { PtauDownloader } from "@src/core";
import { useEnvironment } from "@test-helpers";
import { PtauDownloader } from "src/core";
import { useEnvironment } from "test-helpers";
describe("PtauDownloader", () => {
describe("downloadPtau", () => {

2
test/unit/core/utils/versioning.test.ts
View File

@@ -1,6 +1,6 @@
import { expect } from "chai";
import { getHighestVersion, isVersionValid } from "@src/core/compiler/versioning";
import { getHighestVersion, isVersionValid } from "src/core/compiler/versioning";
describe("Versioning", () => {
describe("isVersionValid", () => {

4
test/unit/core/zkit/circuit-zkit-builder.test.ts
View File

@@ -2,9 +2,9 @@ import { expect } from "chai";
import { CircuitZKit } from "@solarity/zkit";
import { TASK_CIRCUITS_COMPILE, ZKIT_SCOPE_NAME } from "@src/task-names";
import { TASK_CIRCUITS_COMPILE, ZKIT_SCOPE_NAME } from "src/task-names";
import { useEnvironment } from "@test-helpers";
import { useEnvironment } from "test-helpers";
import { updateProvingSystems, updateTypesDir } from "../../../utils";
describe("CircuitZKitBuilder", () => {

4
tsconfig.json
View File

@@ -20,8 +20,8 @@
"@nomicfoundation/hardhat-ethers"
],
"paths": {
"@src/*": ["./src/*"],
"@test-helpers": ["./test/helpers"]
"src/*": ["./src/*"],
"test-helpers": ["./test/helpers"]
}
},
"exclude": [