diff --git a/.gitmessage b/.gitmessage deleted file mode 100644 index 3c4779ee..00000000 --- a/.gitmessage +++ /dev/null @@ -1,44 +0,0 @@ -######################### -# Start of Commit Message -######################### -# Title - -# Body - - -# Footer - -####################### -# End of Commit Message -####################### -# -# Keep each commit line under 50 characters -# Following conventional commits 1.0.0 -# -# Use the prefix naming convention: -# fix: A bug fix. Correlates with PATCH in SemVer -# feat: A new feature. Correlates with MINOR in SemVer -# docs: Documentation only changes -# style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc) -# refactor: A code change that neither fixes a bug nor adds a feature -# perf: A code change that improves performance -# test: Adding missing or correcting existing tests -# build: Changes that affect the build system or external dependencies (example scopes: pip, docker, npm) -# ci: Changes to our CI configuration files and scripts (example scopes: GitLabCI) -# -# For full specification check: https://www.conventionalcommits.org/en/v1.0.0/ -# -# Commits should follow the format below: -# -# [Title] -# : In under 50 characters, description of the commit -# -# [Body] -# Explain in detail what was done in this commit and -# what this is supposed to achieve. Keep this section -# under 72 characters per line. -# -# [Footer] -# Use this section to add any PR/Ticket numbers that this -# commit is solving or any co-authors. If none of these apply, # leave it empty. -# diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml deleted file mode 100644 index 763f347f..00000000 --- a/.pre-commit-config.yaml +++ /dev/null @@ -1,26 +0,0 @@ -repos: - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 - hooks: - - id: check-merge-conflict - - id: trailing-whitespace - - id: end-of-file-fixer - - id: check-json - - id: check-yaml - - id: check-xml - - repo: https://github.com/commitizen-tools/commitizen - rev: 3.5.3 - hooks: - - id: commitizen - stages: [ commit-msg ] - - repo: https://github.com/jguttman94/pre-commit-gradle - rev: v0.3.0 # Use the ref you want to point at - hooks: - - id: gradle-check - args: [ "--wrapper", "--output" ] - - id: gradle-spotless - args: [ "--wrapper", "--output" ] - - repo: https://github.com/executablebooks/mdformat - rev: 0.7.14 - hooks: - - id: mdformat diff --git a/buildSrc/src/main/groovy/RefTestGenerationTask.groovy b/buildSrc/src/main/groovy/RefTestGenerationTask.groovy deleted file mode 100644 index a2dd0b1d..00000000 --- a/buildSrc/src/main/groovy/RefTestGenerationTask.groovy +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright Consensys Software Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -import org.gradle.api.DefaultTask -import org.gradle.api.provider.Property -import org.gradle.api.tasks.Input -import org.gradle.api.tasks.TaskAction - -abstract class RefTestGenerationTask extends DefaultTask { - - @Input - abstract Property getRefTests(); - - @Input - abstract Property getGeneratedRefTestsOutput(); - - @Input - abstract Property getRefTestNamePrefix(); - - @Input - abstract Property getRefTestTemplateFilePath(); - - @Input - abstract Property getRefTestJsonParamsExcludedPath(); - - @Input - abstract Property getRefTestJsonParamsDirectory(); - - - @TaskAction - def generateTests() { - def refTests = project.fileTree(getRefTests().get()) - def refTestTemplateFile = project.file(getRefTestTemplateFilePath().get()) - def refTestJsonParamsDirectory = getRefTestJsonParamsDirectory().get() - def generatedTestsFilePath = getGeneratedRefTestsOutput().get() - def refTestNamePrefix = getRefTestNamePrefix().get() - def excludedPath = getRefTestJsonParamsExcludedPath().get() // exclude test for test filling tool - - // Delete directory with generated tests from previous run. - project.delete(generatedTestsFilePath) - - // Create directory to generate the tests before executing them. - project.mkdir(generatedTestsFilePath) - - def referenceTestTemplate = refTestTemplateFile.text - - // This is how many json files to include in each test file - def fileSets = refTests.getFiles().sort().collate(5) - - fileSets.eachWithIndex { fileSet, idx -> - def paths = [] - fileSet.each { testJsonFile -> - def parentFile = testJsonFile.getParentFile() - def parentPathFile = parentFile.getPath().substring(parentFile.getPath().indexOf(refTestJsonParamsDirectory)) - if (!testJsonFile.getName().toString().startsWith(".") && !excludedPath.contains(parentPathFile)) { - def pathFile = testJsonFile.getPath() - paths << pathFile.substring(pathFile.indexOf(refTestJsonParamsDirectory)) - } - } - - def testFile = project.file(generatedTestsFilePath + "/" + refTestNamePrefix + "_" + idx + ".java") - def allPaths = '"' + paths.join('", "') + '"' - - def testFileContents = referenceTestTemplate - .replaceAll("%%TESTS_FILE%%", allPaths) - .replaceAll("%%TESTS_NAME%%", refTestNamePrefix + "_" + idx) - testFile.newWriter().withWriter { w -> w << testFileContents } - } - } -} diff --git a/buildSrc/src/main/groovy/TraceFilesTask.groovy b/buildSrc/src/main/groovy/TraceFilesTask.groovy deleted file mode 100644 index 72b111aa..00000000 --- a/buildSrc/src/main/groovy/TraceFilesTask.groovy +++ /dev/null @@ -1,34 +0,0 @@ -import org.gradle.api.provider.ListProperty -import org.gradle.api.provider.Property -import org.gradle.api.tasks.Exec -import org.gradle.api.tasks.Input -import org.gradle.api.tasks.Optional - -abstract class TraceFilesTask extends Exec { - - @Input - abstract Property getModule() - - @Input - abstract ListProperty getFiles() - - @Input - @Optional - abstract Property getModuleDir() - - @Override - protected void exec() { - def arguments = ["besu", - "-P", module.get(), - "-o", "${project.projectDir}/src/main/java/net/consensys/linea/zktracer/module/${moduleDir.getOrElse(module.get())}" - ] - arguments.addAll(files.get().collect({"zkevm-constraints/${it}"})) - - workingDir project.rootDir - executable "corset" - args arguments - - println "Generating traces for ${module.get()} from ${arguments}" - super.exec() - } -} diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml deleted file mode 100644 index 3cc777ba..00000000 --- a/config/checkstyle/checkstyle.xml +++ /dev/null @@ -1,383 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml deleted file mode 100644 index 2dd2bc56..00000000 --- a/config/checkstyle/suppressions.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/gradle.properties b/gradle.properties index 93832564..0863e57a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,6 +4,4 @@ arithmetizationVersion=0.1.5-rc3 besuArtifactGroup=io.consensys.linea-besu distributionIdentifier=linea-sequencer distributionBaseUrl=https://artifacts.consensys.net/public/linea-besu/raw/names/linea-besu.tar.gz/versions/ -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx4096m + diff --git a/gradle/tests.gradle b/gradle/tests.gradle index a3b9abb9..c01c93fd 100644 --- a/gradle/tests.gradle +++ b/gradle/tests.gradle @@ -20,30 +20,9 @@ jacoco { toolVersion = '0.8.12' } -/* - * Pass some system properties provided on the gradle command line to test executions for - * convenience. - * - * The properties passed are: - * - 'test.ethereum.include': allows to run a single Ethereum reference tests. For instance, - * running a single general state test can be done with: - * ./gradlew :ethereum:tech.pegasys.ethsigner.ethereum.vm:test -Dtest.single=GeneralStateTest -Dtest.ethereum.include=callcodecallcallcode_101-Frontier - * The meaning being that will be run only the tests for which the value passed as "include" - * (which can be a java pattern) matches parts of the test name. Knowing that tests names for - * reference tests are of the form: - * (-([])?)? - * where is the test name as defined in the json file (usually the name of the json file - * as well), is the Ethereum milestone tested (not all test use it) and - * is only use in some general state tests where for the same json file and same milestone, - * multiple variant of that test are run. The variant is a simple number. - * - 'root.log.level' and 'evm.log.level': allow to control the log level used during the tests. - */ test { description = 'Runs unit tests.' - minHeapSize = "4g" - maxHeapSize = "8g" - useJUnitPlatform { excludeTags("AcceptanceTest") } diff --git a/scripts/generate-jq-output.sh b/scripts/generate-jq-output.sh deleted file mode 100755 index df10064f..00000000 --- a/scripts/generate-jq-output.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# first arg is module name eg add -module=$1 - -# make output dir -OUTDIR=jq-$module -mkdir $OUTDIR - -# run jq on each file, and the output goes into that dir -for f in *.json -do - echo "jq .$module $f > $OUTDIR/$f" - jq .$module $f > $OUTDIR/$f -done diff --git a/shell.nix b/shell.nix deleted file mode 100644 index bcf17e0c..00000000 --- a/shell.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs ? import {} }: - -pkgs.mkShell { - buildInputs = [ - pkgs.jdk17 pkgs.gradle_7 pkgs.solc pkgs.pre-commit - ]; -}