Skip to content

Commit

Permalink
Merge branch 'ray/eth-bridge-clippy-abcipp' into ray/eth-bridge-0.13
Browse files Browse the repository at this point in the history
* ray/eth-bridge-clippy-abcipp:
  vm_env: use tendermint/tendermint-abcipp features
  Makefile: use abcipp feature for PoS in clippy-abcipp
  Makefile: restore vm_env and wasm to clippy-abcipp
  • Loading branch information
juped committed Jan 11, 2023
2 parents 87adc5f + 51c4e1e commit 6f1cd75
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
13 changes: 11 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,24 @@ clippy-abcipp:
--features "std testing abcipp" && \
$(cargo) +$(nightly) clippy --all-targets \
--manifest-path ./proof_of_stake/Cargo.toml \
--features "testing" && \
--no-default-features \
--features "testing abcipp" && \
$(cargo) +$(nightly) clippy --all-targets \
--manifest-path ./core/Cargo.toml \
--no-default-features \
--features "testing wasm-runtime abcipp ibc-mocks-abcipp ferveo-tpke"
$(cargo) +$(nightly) clippy --all-targets \
--manifest-path ./shared/Cargo.toml \
--no-default-features \
--features "testing wasm-runtime abcipp ibc-mocks-abcipp ferveo-tpke"
--features "testing wasm-runtime abcipp ibc-mocks-abcipp ferveo-tpke" && \
$(cargo) +$(nightly) clippy \
--all-targets \
--manifest-path ./vm_env/Cargo.toml \
--no-default-features \
--features "abcipp" && \
make -C $(wasms) clippy && \
$(foreach wasm,$(wasm_templates),$(clippy-wasm) && ) true

clippy-fix:
$(cargo) +$(nightly) clippy --fix -Z unstable-options --all-targets --allow-dirty --allow-staged

Expand Down
5 changes: 5 additions & 0 deletions vm_env/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ version = "0.12.1"
default = ["abciplus"]
abciplus = [
"namada_core/abciplus",
"namada_core/tendermint",
]
abcipp = [
"namada_core/abcipp",
"namada_core/tendermint-abcipp",
]

[dependencies]
Expand Down

0 comments on commit 6f1cd75

Please sign in to comment.