Skip to content

Commit

Permalink
mono repo final sync (#17)
Browse files Browse the repository at this point in the history
* chore: copy all crates

* chore: switch to local dependencies

* chore: delete old papyrus_test_utils crate

* chore: rename crate test_utils -> papyrus_test_utils

* chore: fix RPCTransactio name in the mempool

* chore: fix mockito deps in papyrus and gateway

* chore: update cairo-* deps version

* chore: update config and presets for mempool and papyrus

* chore: rename default_config.json -> papyrus_default_config.json

* chore: rustfmt

* chore: reorg folders

* chore: reorg folders

* chore: fix unused deps

* chore: update papyrus Dockerfile

* chore: update scripts folder

* chore: copy build_native_blockifier.sh

* chore: copy BUILD and WORKSPACE files (from blockifier and committer)

* chore: update papyrus non crates folders and files

* chore: copy blockifier docs

* chore: copy committer taplo.toml

* chore: fix config tests

* chore: copy blockifier docker file

* fix: papyrus integration test runs only Papyrus related tests

* chore: rename conflicting dump_config.rs files

* chore: fix cargo doc errors

* chore: fix CI

* chore: small optimizations for the papyrus CI

* chore: copy README files

* chore: meld common repo files

---------

Co-authored-by: alon.dotan <[email protected]>
Co-authored-by: Dan Brownstein <[email protected]>
  • Loading branch information
3 people authored Jul 18, 2024
1 parent 6b8f0db commit e16fff4
Show file tree
Hide file tree
Showing 264 changed files with 112,401 additions and 9,863 deletions.
42 changes: 39 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,50 @@ jobs:
run: |
python3 -m venv ci
ci/bin/pip install -r scripts/requirements.txt
ci/bin/python scripts/run_tests.py --changes_only --commit_id ${{ github.base_ref }}
ci/bin/python scripts/run_tests.py --changes_only --features concurrency --commit_id ${{ github.base_ref }}
ci/bin/python scripts/run_tests.py --changes_only --commit_id ${{ github.event.pull_request.base.sha }}
ci/bin/python scripts/run_tests.py --changes_only --features concurrency --commit_id ${{ github.event.pull_request.base.sha }}
env:
SEED: 0

# Keep the name 'udeps' to match original action name, so we don't need to define specific branch
# rules on Github for specific version branches.
udeps:
machete:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Run Machete (detect unused dependencies)
uses: bnjbvr/cargo-machete@main


udeps:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
name: "Rust Toolchain Setup"
with:
toolchain: nightly-2024-01-12
- uses: Swatinem/rust-cache@v2
- uses: Noelware/[email protected]
with:
version: ${{env.PROTOC_VERSION}}

- name: "Download and run cargo-udeps"
run: |
wget -O - -c https://github.com/est31/cargo-udeps/releases/download/v0.1.35/cargo-udeps-v0.1.35-x86_64-unknown-linux-gnu.tar.gz | tar -xz
cargo-udeps-*/cargo-udeps udeps
env:
RUSTUP_TOOLCHAIN: nightly-2024-01-12

check:
runs-on: ubuntu-latest
env:
RUSTDOCFLAGS: "-D warnings"
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- uses: Noelware/[email protected]
with:
version: ${{env.PROTOC_VERSION}}
- run: cargo check --workspace -r --all-features
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ on:
- main
paths:
- deployments/**
- config/default_config.json
- .github/workflows/helm-install.yml
- config/papyrus/default_config.json
- .github/workflows/papyrus/helm-install.yml

jobs:
deploy-teardown:
Expand Down
105 changes: 11 additions & 94 deletions .github/workflows/papyrus_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ env:
PROTOC_VERSION: v25.1

jobs:


executable-run:
runs-on: ubuntu-latest
steps:
Expand All @@ -34,10 +32,10 @@ jobs:
- uses: Noelware/[email protected]
with:
version: ${{env.PROTOC_VERSION}}
- run: mkdir data

- name: Build node
run: cargo build -r
run: |
mkdir data
cargo build -r
- name: Run executable
run: >
Expand All @@ -53,32 +51,16 @@ jobs:
- uses: Noelware/[email protected]
with:
version: ${{env.PROTOC_VERSION}}
- run: mkdir data

- name: Build node
run: cargo build -r --no-default-features
run: |
mkdir data
cargo build -r --no-default-features
- name: Run executable
run: >
target/release/papyrus_node --base_layer.node_url ${{ secrets.CI_BASE_LAYER_NODE_URL }}
& sleep 30 ; kill $!
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- uses: Noelware/[email protected]
with:
version: ${{env.PROTOC_VERSION}}
- run: npm install -g [email protected]

- run: |
cargo test --workspace -r
env:
SEED: 0
integration-test:
runs-on: ubuntu-latest
steps:
Expand All @@ -89,7 +71,11 @@ jobs:
with:
version: ${{env.PROTOC_VERSION}}
- run: >
cargo test -r --test '*' -- --include-ignored --skip test_gw_integration_testnet;
cargo test -r
--test latency_histogram
--test gateway_integration_test
--test feeder_gateway_integration_test
-- --include-ignored --skip test_gw_integration_testnet;
cargo run -r -p papyrus_node --bin central_source_integration_test --features="futures-util tokio-stream"
test-no-rpc:
Expand All @@ -105,60 +91,6 @@ jobs:
env:
SEED: 0
rustfmt:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
components: rustfmt
toolchain: nightly-2024-01-12
- uses: Swatinem/rust-cache@v2
- uses: Noelware/[email protected]
with:
version: ${{env.PROTOC_VERSION}}

- run: cargo +nightly-2024-01-12 fmt --all -- --check

udeps:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
name: "Rust Toolchain Setup"
with:
toolchain: nightly-2024-01-12
- uses: Swatinem/rust-cache@v2
- uses: Noelware/[email protected]
with:
version: ${{env.PROTOC_VERSION}}

- name: "Download and run cargo-udeps"
run: |
wget -O - -c https://github.com/est31/cargo-udeps/releases/download/v0.1.35/cargo-udeps-v0.1.35-x86_64-unknown-linux-gnu.tar.gz | tar -xz
cargo-udeps-*/cargo-udeps udeps
env:
RUSTUP_TOOLCHAIN: nightly-2024-01-12

clippy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
components: clippy
- uses: Swatinem/rust-cache@v2
- uses: Noelware/[email protected]
with:
version: ${{env.PROTOC_VERSION}}

- run: echo "Skipping clippy for now"
- run: >
cargo clippy --workspace --all-targets --all-features -- -D warnings
-D future-incompatible -D nonstandard-style -D rust-2018-idioms -D unused
-D clippy::unwrap_used -A clippy::blocks_in_conditions # This is because of a bug in tracing: https://github.com/tokio-rs/tracing/issues/2876
doc:
runs-on: ubuntu-latest
env:
Expand All @@ -170,23 +102,8 @@ jobs:
- uses: Noelware/[email protected]
with:
version: ${{env.PROTOC_VERSION}}

- run: cargo doc --workspace -r --document-private-items --no-deps

check:
runs-on: ubuntu-latest
env:
RUSTDOCFLAGS: "-D warnings"
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- uses: Noelware/[email protected]
with:
version: ${{env.PROTOC_VERSION}}

- run: cargo check --workspace -r --all-features

codecov:
runs-on: ubuntu-latest
steps:
Expand Down
20 changes: 19 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
/ci
# Generated by Cargo
# will have compiled files and executables
debug/
target/

# These are backup files generated by rustfmt
**/*.rs.bk

# MSVC Windows builds of rustc generate these, which store debugging information
*.pdb

*.egg-info
build
dist
target
*/.vscode/*
*.DS_Store
tmp_venv/*
.vscode/settings.json
/data
/logs
/target
Expand Down
8 changes: 8 additions & 0 deletions BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Export the built artifact to allow local builds.
exports_files([
"target/release/libnative_blockifier.so",
"target/debug/committer_cli",
"target/release/committer_cli",
"target/x86_64-unknown-linux-musl/debug/committer_cli",
"target/x86_64-unknown-linux-musl/release/committer_cli",
])
Loading

0 comments on commit e16fff4

Please sign in to comment.