Skip to content

Commit

Permalink
Merge branch 'james/mainline/fix-abcipp' (#754)
Browse files Browse the repository at this point in the history
* james/mainline/fix-abcipp:
  Add changelog
  Add check-abcipp command
  Use ferveo-tpke flag to stop tendermint-rpc being pulled into wasm
  First attempt at fixing shared abcipp
  • Loading branch information
tzemanovic committed Nov 25, 2022
2 parents c10a1c2 + 2604a91 commit 86bc6f7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .changelog/unreleased/bug-fixes/754-fix-abcipp.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Fix building with the feature again
([#754](https://github.com/anoma/namada/pull/754))
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ check:
make -C $(wasms_for_tests) check && \
$(foreach wasm,$(wasm_templates),$(check-wasm) && ) true

check-abcipp:
$(cargo) check --all-targets --no-default-features --features "abcipp namada/ibc-mocks-abcipp"

clippy-wasm = $(cargo) +$(nightly) clippy --manifest-path $(wasm)/Cargo.toml --all-targets -- -D warnings

clippy:
Expand Down
2 changes: 2 additions & 0 deletions shared/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ abcipp = [
"ibc-abcipp",
"tendermint-abcipp",
"tendermint-proto-abcipp",
# it's OK to include the tendermint-rpc feature here, as we aren't currently building wasms with `abcipp`
"tendermint-rpc-abcipp",
]
abciplus = [
"namada_core/abciplus",
Expand Down

0 comments on commit 86bc6f7

Please sign in to comment.