Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
egasimus committed Aug 29, 2024
2 parents 66ea996 + cc0a448 commit 2af1972
Show file tree
Hide file tree
Showing 250 changed files with 4,732 additions and 4,368 deletions.
3 changes: 3 additions & 0 deletions .changelog/unreleased/bug-fixes/3700-fix-error-mishandling.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Now we propagate the error coming from
`is_proposal_accepted` instead of falling back on a default.
([\#3700](https://github.com/anoma/namada/pull/3700))
2 changes: 2 additions & 0 deletions .changelog/unreleased/bug-fixes/3705-wallet-decoding-err.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Handle errors when loading wallet file and only create a new one if not found.
([\#2151](https://github.com/anoma/namada/issues/2151))
3 changes: 3 additions & 0 deletions .changelog/unreleased/improvements/3670-crate-refactors.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Reorganized some types and modules and refactored crates re-
exports, error handling features and removed unused depdendencies.
([\#3670](https://github.com/anoma/namada/pull/3670))
7 changes: 7 additions & 0 deletions .changelog/unreleased/improvements/3687-apply-snapshots.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
- Addresses the remaining points of Issue [\#3307](https://github.com/anoma/namada/issues/3307)

- Implements the `OfferSnapshot` ABCI call
- Implements the `ApplySnapshotChunk` ABCI call
- Adds integration tests

([\#3687](https://github.com/anoma/namada/pull/3687))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Only re-exporting tendermint-rs v0.37 modules.
([\#3697](https://github.com/anoma/namada/pull/3697))
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- Optimize the format of snapshots taken for state syncing purposes.
Snapshots are taken over the entire RocksDB database, packaged into
a `zstd` compressed `tar` archive, and split into 10 MB chunks.
([\#3701](https://github.com/anoma/namada/pull/3701))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Change the quorum for voting on a default governance proposal from 2/3 to 40%.
([\#3703](https://github.com/anoma/namada/pull/3703))
44 changes: 36 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -290,12 +290,11 @@ jobs:
# run: cargo +${{ env.NIGHTLY }} llvm-cov nextest run -E 'not test(e2e)' -E 'not test(integration)' -E 'not test(pos_state_machine_test)' --features namada/testing --no-fail-fast --lcov --output-path lcov.info
env:
RUSTFLAGS: "-C linker=clang -C link-arg=-fuse-ld=/usr/local/bin/mold -Z threads=8"
- name: Upload coverage
uses: codecov/codecov-action@v4
- name: Store coverage file artifact
uses: actions/upload-artifact@v4
with:
files: lcov.info
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}
name: unit-cov-${{ github.event.pull_request.head.sha || github.sha }}
path: lcov.info # output of `make test-unit-with-coverage`
- name: Clean cargo cache
if: steps.cache.outputs.cache-hit != 'true'
run: cargo cache --autoclean-expensive
Expand Down Expand Up @@ -387,10 +386,16 @@ jobs:
with:
name: wasm-for-tests-${{ github.event.pull_request.head.sha|| github.sha }}
path: wasm_for_tests
- name: Run integration tests
run: cargo +${{ env.NIGHTLY }} nextest run -E 'test(integration)' --test-threads 1 --no-fail-fast --features integration
- name: Run integration tests with coverage
run: make test-integration-with-coverage
# run: cargo +${{ env.NIGHTLY }} nextest run -E 'test(integration)' --test-threads 1 --no-fail-fast
env:
RUSTFLAGS: "-C linker=clang -C link-arg=-fuse-ld=/usr/local/bin/mold -Z threads=8"
- name: Store coverage file artifact
uses: actions/upload-artifact@v4
with:
name: integration-cov-${{ github.event.pull_request.head.sha || github.sha }}
path: lcov.info # output of `make test-integration-with-coverage`
- name: Clean cargo cache
if: steps.cache.outputs.cache-hit != 'true'
run: cargo cache --autoclean-expensive
Expand Down Expand Up @@ -607,4 +612,27 @@ jobs:
run: cargo cache --autoclean-expensive
- name: Stop sccache
if: always() && steps.sccache.conclusion == 'success'
run: sccache --stop-server || true
run: sccache --stop-server || true

upload-coverage:
runs-on: [ubuntu-latest]
timeout-minutes: 20
needs: [test-unit, test-integration]

steps:
- name: Download unit coverage artifacts
uses: actions/download-artifact@v4
with:
name: unit-cov-${{ github.event.pull_request.head.sha || github.sha }}
path: unit-cov
- name: Download integration coverage artifacts
uses: actions/download-artifact@v4
with:
name: integration-cov-${{ github.event.pull_request.head.sha || github.sha }}
path: integration-cov
- name: Upload coverage to codecov
uses: codecov/codecov-action@v4
with:
files: integration-cov/lcov.info, unit-cov/lcov.info
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}
69 changes: 37 additions & 32 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ winapi = "0.3.9"
xorf = { version = "0.11.0", features = ["serde"] }
yansi = "0.5.1"
zeroize = { version = "1.5.5", features = ["zeroize_derive"] }
zstd = "0.13.2"

[patch.crates-io]
# Patch to the fork containing the correct personalization and basepoints for masp
Expand Down
Loading

0 comments on commit 2af1972

Please sign in to comment.