Skip to content
This repository was archived by the owner on Jul 5, 2024. It is now read-only.

Commit 2fb87b0

Browse files
committed
merge main back to proof chunk
2 parents 0ab41c9 + 3bbc757 commit 2fb87b0

File tree

336 files changed

+10193
-11988
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

336 files changed

+10193
-11988
lines changed

.github/pull_request_template.md

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
- [ ] New feature (non-breaking change which adds functionality)
1313
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
1414
- [ ] This change requires a documentation update
15+
- [ ] Refactor (no updates to logic)
1516

1617
### Contents
1718

.github/testoolScripts/cleanup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ runner_vpc_id="vpc-05dedcb650bd24f8d"
66
# Get runner status
77
runner=$(aws ec2 describe-instances --profile $profile --filters Name=tag:Name,Values=[testool] Name=network-interface.vpc-id,Values=[$runner_vpc_id] --query "Reservations[*].Instances[*][InstanceId]" --output text | xargs)
88

9-
echo "Reports: http://testool-public.s3-website.eu-central-1.amazonaws.com"
9+
echo "Reports: https://testool.pse.dev"
1010
echo "Shuting down instance..."
1111
aws ec2 stop-instances --profile $profile --instance-ids $runner
1212

.github/workflows/mpt-witness-generator.yml .github/workflows/geth-utils.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: MPT Witness Generator Checks
1+
name: Geth-utils Checks
22

33
on:
44
merge_group:
@@ -19,7 +19,7 @@ jobs:
1919
with:
2020
cancel_others: 'true'
2121
concurrent_skipping: 'same_content_newer'
22-
paths: '["mpt-witness-generator/**"]'
22+
paths: '["geth-utils/**"]'
2323

2424

2525
build:
@@ -30,20 +30,20 @@ jobs:
3030
- name: Set up Go
3131
uses: actions/setup-go@v4
3232
with:
33-
go-version: '1.20'
33+
go-version: '1.21'
3434

3535
- name: Format
3636
uses: Jerome1337/[email protected]
3737
with:
38-
gofmt-path: './mpt-witness-generator'
38+
gofmt-path: './geth-utils'
3939
gofmt-flags: '-l -d'
4040

4141
- name: Build
42-
working-directory: ./mpt-witness-generator
42+
working-directory: ./geth-utils
4343
run: go build -v ./...
4444

4545
- name: Test
46-
working-directory: ./mpt-witness-generator
46+
working-directory: ./geth-utils
4747
env:
4848
NO_GETH: true
4949
run: go test -v ./...

.github/workflows/integration.yml

+2-12
Original file line numberDiff line numberDiff line change
@@ -70,19 +70,9 @@ jobs:
7070
with:
7171
override: false
7272
- name: Setup golang
73-
uses: actions/setup-go@v3
73+
uses: actions/setup-go@v4
7474
with:
75-
go-version: ~1.19
76-
# Go cache for building geth-utils
77-
- name: Go cache
78-
uses: actions/cache@v3
79-
with:
80-
path: |
81-
~/.cache/go-build
82-
~/go/pkg/mod
83-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
84-
restore-keys: |
85-
${{ runner.os }}-go-
75+
go-version: ~1.21
8676
- name: Cargo cache
8777
uses: actions/cache@v3
8878
with:

.github/workflows/lints.yml

+3-9
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,10 @@ jobs:
3838
with:
3939
components: rustfmt, clippy
4040
override: false
41-
# Go cache for building geth-utils
42-
- name: Go cache
43-
uses: actions/cache@v3
41+
- name: Setup golang
42+
uses: actions/setup-go@v4
4443
with:
45-
path: |
46-
~/.cache/go-build
47-
~/go/pkg/mod
48-
key: lint-${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
49-
restore-keys: |
50-
${{ runner.os }}-go-
44+
go-version: ~1.21
5145
- name: Cargo cache
5246
uses: actions/cache@v3
5347
with:

.github/workflows/main-tests.yml

+8-34
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,9 @@ jobs:
4646
with:
4747
override: false
4848
- name: Setup golang
49-
uses: actions/setup-go@v3
49+
uses: actions/setup-go@v4
5050
with:
51-
go-version: ~1.19
52-
# Go cache for building geth-utils
53-
- name: Go cache
54-
uses: actions/cache@v3
55-
with:
56-
path: |
57-
~/.cache/go-build
58-
~/go/pkg/mod
59-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
60-
restore-keys: |
61-
${{ runner.os }}-go-
51+
go-version: ~1.21
6252
- name: Cargo cache
6353
uses: actions/cache@v3
6454
with:
@@ -79,7 +69,7 @@ jobs:
7969
uses: actions-rs/cargo@v1
8070
with:
8171
command: test
82-
args: --verbose --release --all --all-features --exclude integration-tests --exclude circuit-benchmarks
72+
args: --verbose --release --all --all-features --exclude integration-tests --exclude circuit-benchmarks -- --test-threads 24
8373
- name: Run testool internal tests
8474
uses: actions-rs/cargo@v1
8575
with:
@@ -104,19 +94,9 @@ jobs:
10494
with:
10595
override: false
10696
- name: Setup golang
107-
uses: actions/setup-go@v3
108-
with:
109-
go-version: ~1.19
110-
# Go cache for building geth-utils
111-
- name: Go cache
112-
uses: actions/cache@v3
97+
uses: actions/setup-go@v4
11398
with:
114-
path: |
115-
~/.cache/go-build
116-
~/go/pkg/mod
117-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
118-
restore-keys: |
119-
${{ runner.os }}-go-
99+
go-version: ~1.21
120100
- name: Cargo cache
121101
uses: actions/cache@v3
122102
with:
@@ -155,16 +135,10 @@ jobs:
155135
override: false
156136
- name: Add target
157137
run: rustup target add x86_64-unknown-linux-gnu
158-
# Go cache for building geth-utils
159-
- name: Go cache
160-
uses: actions/cache@v3
138+
- name: Setup golang
139+
uses: actions/setup-go@v4
161140
with:
162-
path: |
163-
~/.cache/go-build
164-
~/go/pkg/mod
165-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
166-
restore-keys: |
167-
${{ runner.os }}-go-
141+
go-version: ~1.21
168142
- name: Cargo cache
169143
uses: actions/cache@v3
170144
with:

.github/workflows/test-features.yml

+3-9
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,10 @@ jobs:
3636
- uses: actions-rs/toolchain@v1
3737
with:
3838
override: false
39-
40-
# Go cache for building geth-utils
41-
- name: Go cache
42-
uses: actions/cache@v3
39+
- name: Setup golang
40+
uses: actions/setup-go@v4
4341
with:
44-
path: |
45-
~/.cache/go-build
46-
~/go/pkg/mod
47-
key: ${{ github.workflow }}-${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
48-
42+
go-version: ~1.21
4943
- name: Cargo cache
5044
uses: actions/cache@v3
5145
with:

0 commit comments

Comments
 (0)