Skip to content

Commit

Permalink
Remove arthimization code and include it as dependency
Browse files Browse the repository at this point in the history
Signed-off-by: Fabio Di Fabio <[email protected]>
  • Loading branch information
fab-10 committed May 29, 2024
1 parent c216a58 commit f4bb24f
Show file tree
Hide file tree
Showing 455 changed files with 62 additions and 69,693 deletions.
25 changes: 1 addition & 24 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: distributions
path: arithmetization/build/libs
path: sequencer/build/libs

acceptanceTest:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -99,29 +99,6 @@ jobs:
name: compress-test-report
path: compress/build/reports/tests/

tests:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'adopt'

- name: Run unit tests
run: ./gradlew :arithmetization:test
env:
JAVA_OPTS: -Dorg.gradle.daemon=false

- name: Upload test report
uses: actions/upload-artifact@v3
with:
name: unit-test-report
path: arithmetization/build/reports/tests/

spotless:
runs-on: ubuntu-latest
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./arithmetization/build/libs/besu-sequencer-plugins-${{ steps.get_version.outputs.VERSION }}.jar
asset_name: besu-sequencer-plugins-${{ steps.get_version.outputs.VERSION }}.jar
asset_path: ./sequencer/build/libs/linea-sequencer${{ steps.get_version.outputs.VERSION }}.jar
asset_name: linea-sequencer-${{ steps.get_version.outputs.VERSION }}.jar
asset_content_type: application/octet-stream
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,4 @@ out/
site/
/.direnv/
/.envrc
reference-tests/src/test/java/net/consensys/linea/generated/*
!reference-tests/src/test/java/net/consensys/linea/generated/.gitkeep
arithmetization/bin/
acceptance-tests/bin/
reference-tests/bin/
6 changes: 0 additions & 6 deletions .gitmodules

This file was deleted.

6 changes: 3 additions & 3 deletions acceptance-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ plugins {
apply from: rootProject.file("gradle/java.gradle")
apply from: rootProject.file("gradle/dependency-management.gradle")
apply from: rootProject.file('gradle/common-dependencies.gradle')
apply from: rootProject.file("gradle/corset.gradle")
apply from: rootProject.file("gradle/tests.gradle")
apply from: rootProject.file("gradle/lint.gradle")

Expand All @@ -41,7 +40,7 @@ tasks.register('acceptanceTests', Test) {
description = 'Runs acceptance tests.'

dependsOn(project(":native:compress").compileJava)
dependsOn(project(":arithmetization").copyPluginJar)
dependsOn(project(":sequencer").copyPluginJar)

inputs.property("integration.date", LocalTime.now()) // so it runs on every invocation

Expand All @@ -55,8 +54,9 @@ tasks.register('acceptanceTests', Test) {
}

dependencies {
testImplementation project(":arithmetization")
testImplementation 'net.consensys.linea.zktracer:arithmetization'
testImplementation project(":native:compress")
testImplementation project(":sequencer")
testImplementation "${besuArtifactGroup}.internal:dsl:$besuVersion"
testImplementation "${besuArtifactGroup}:besu-datatypes:$besuVersion"
testImplementation "${besuArtifactGroup}.internal:eth:$besuVersion"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ public static BlockHeader createBlockHeader(
null,
null,
null,
null,
blockHeaderFunctions);
}
}
6 changes: 5 additions & 1 deletion acceptance-tests/src/test/resources/moduleLimits.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ BIN = 262144
BIN_RT = 262144
EC_DATA = 4096
EUC = 16384 # can probably be lower
EXP = 32760
EXT = 32768
HUB = 2097152
INSTRUCTION_DECODER = 512 # Ugly hack, TODO: @franklin
Expand Down Expand Up @@ -43,7 +44,7 @@ RLP_TXN = 262144
RLP_TXRCPT = 262144
TXN_DATA = 262144
STP = 262144

OOB = 262144
#
# Block-specific limits
#
Expand All @@ -52,6 +53,9 @@ BLOCK_L2L1LOGS = 16
BLOCK_KECCAK = 8192
BLOCK_L1SIZE = 1000000

BLOCKDATA = 13
BLOCKHASH = 1

#
# Precompiles limits
#
Expand Down
4 changes: 4 additions & 0 deletions acceptance-tests/src/test/resources/noModuleLimits.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ BIN = 262144
BIN_RT = 262144
EC_DATA = 4096
EUC = 16384 # can probably be lower
EXP = 32760
EXT = 32768
HUB = 2097152
INSTRUCTION_DECODER = 512 # Ugly hack, TODO: @franklin
Expand Down Expand Up @@ -43,6 +44,9 @@ RLP_TXN = 262144
RLP_TXRCPT = 262144
TXN_DATA = 262144
STP = 262144
OOB = 262144
BLOCKDATA = 13
BLOCKHASH = 1

#
# Block-specific limits
Expand Down
4 changes: 4 additions & 0 deletions acceptance-tests/src/test/resources/strictModuleLimits.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ BIN = 262144
BIN_RT = 262144
EC_DATA = 4096
EUC = 16384 # can probably be lower
EXP = 32760
EXT = 32768
HUB = 10000
INSTRUCTION_DECODER = 512 # Ugly hack, TODO: @franklin
Expand Down Expand Up @@ -43,6 +44,9 @@ RLP_TXN = 262144
RLP_TXRCPT = 262144
TXN_DATA = 262144
STP = 262144
OOB = 262144
BLOCKDATA = 13
BLOCKHASH = 1

#
# Block-specific limits
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ BIN = 262144
BIN_RT = 262144
EC_DATA = 4096
EUC = 16384 # can probably be lower
EXP = 32760
EXT = 20
HUB = 30
INSTRUCTION_DECODER = 256 # Ugly hack, TODO: @franklin
Expand Down Expand Up @@ -44,6 +45,9 @@ RLP_TXN = 1300
RLP_TXRCPT = 100
TXN_DATA = 30
STP = 20
OOB = 262144
BLOCKDATA = 13
BLOCKHASH = 1

#
# Block-specific limits
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit f4bb24f

Please sign in to comment.