Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update hotshot #279

Merged
merged 28 commits into from
Dec 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
bab88e5
Update flake
sveitser Nov 30, 2023
1c3f73a
Cargo.lock file without conflicts
sveitser Nov 30, 2023
90bfc67
WIP: use new APIs
sveitser Dec 1, 2023
51504d4
WIP: churning through compilation errors
sveitser Dec 4, 2023
afb6195
delete, delete, delete
sveitser Dec 4, 2023
b918e60
Cargo update (to get latest hotshot release)
sveitser Dec 5, 2023
b4de239
More deleting of no longer required generics
sveitser Dec 5, 2023
2d60bfa
Track `main` branch of `commit` crate
sveitser Dec 5, 2023
3a609bc
Constrain QueryableBlock to be Commitable
sveitser Dec 5, 2023
9db9aad
WIP: fixing more compile errors
sveitser Dec 5, 2023
6573c41
Compiles without tests
sveitser Dec 5, 2023
24c8b05
Remove some unused imports
sveitser Dec 5, 2023
9a5e193
Add back check for leaf chain integrity
sveitser Dec 5, 2023
7325c1f
Implement block commitment and mock types
jbearer Dec 6, 2023
2a888e8
Fix build all targets
jbearer Dec 6, 2023
94bbf84
Uncomment test_revert, fix clippy
jbearer Dec 6, 2023
39664d5
Fix SQL statement
sveitser Dec 6, 2023
3601353
Fix update test by inserting genesis leaf, block
sveitser Dec 6, 2023
9ae07ed
Implement minimal `StatusDataSource`
jbearer Dec 6, 2023
b1ddceb
Enable status tests to be run without an availability data source
jbearer Dec 6, 2023
9c54caf
Merge pull request #290 from EspressoSystems/feat/metrics-data-source
jbearer Dec 6, 2023
47ef27e
Move genesis block insertion to data source creation.
jbearer Dec 6, 2023
200a715
Fix clippy
jbearer Dec 6, 2023
f7021f6
Fix doc links
jbearer Dec 6, 2023
75d0012
Fix doc tests (except for metrics constructors)
jbearer Dec 6, 2023
14492ef
Switch back to main HotShot
jbearer Dec 6, 2023
b3417fa
Upgrade to new metrics constructors
jbearer Dec 6, 2023
3729d87
Fix windows build
jbearer Dec 7, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,14 @@ jobs:
run: cargo audit --ignore RUSTSEC-2023-0018 --ignore RUSTSEC-2023-0063 --ignore RUSTSEC-2023-0065

- name: Build
# Build in release without `testing` feature, this should work without `hotshot_example` config.
run: |
cargo build --workspace --release

- name: Test
# Build test binary with `testing` feature, which requires `hotshot_example` config
run: |
export RUSTFLAGS="$RUSTFLAGS --cfg hotshot_example"
cargo test --workspace --release --all-features --no-run
cargo test --workspace --release --all-features --verbose -- --test-threads 2
timeout-minutes: 60
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
windows:
runs-on: windows-latest
env:
RUSTFLAGS: "--cfg async_executor_impl=\"async-std\" --cfg async_channel_impl=\"async-std\""
RUSTFLAGS: "--cfg async_executor_impl=\"async-std\" --cfg async_channel_impl=\"async-std\" --cfg hotshot_example"
RUST_LOG: info
steps:
- name: Configure Git
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,16 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
# Lint with all combinations of feature flags
# Lint with many combinations of feature flags
features:
# No optional features
- ''
# Each optional feature on its own
- sql-data-source
- file-system-data-source
- sql-data-source,file-system-data-source
- metrics-data-source
# All optional features together
- sql-data-source,file-system-data-source,metrics-data-source
env:
RUSTFLAGS: "--cfg async_executor_impl=\"async-std\" --cfg async_channel_impl=\"async-std\""
RUST_LOG: info
Expand Down
Loading
Loading