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

Fix compiling with the abcipp feature flag #754

Merged
merged 6 commits into from Nov 30, 2022
Merged

Conversation

james-chf
Copy link
Contributor

@james-chf james-chf commented Nov 7, 2022

Relates to #497

  • fixes up the namada crate to import tendermint-rs crates via a facade
  • tendermint-rpc should be used only conditionally on the ferveo-tpke flag being enabled, so that it won't be pulled into wasm builds (use of this flag is a hack that we should remove/replace in this PR or after)
  • adds a make check-abcipp target

We could start running make check-abcipp in CI after this PR lands

@james-chf james-chf changed the base branch from main to eth-bridge-integration November 8, 2022 10:34
@james-chf james-chf changed the base branch from eth-bridge-integration to main November 8, 2022 10:34
@james-chf james-chf marked this pull request as ready for review November 9, 2022 12:42
@james-chf james-chf marked this pull request as draft November 9, 2022 17:30
@james-chf james-chf marked this pull request as ready for review November 10, 2022 09:33
@james-chf james-chf linked an issue Nov 16, 2022 that may be closed by this pull request
4 tasks
tzemanovic
tzemanovic previously approved these changes Nov 17, 2022
tzemanovic added a commit that referenced this pull request Nov 17, 2022
- Additionally updated imports in
  - `shared/src/ledger/queries/shell.rs`
  - `apps/src/lib/client/types.rs`

* 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
@james-chf james-chf linked an issue Nov 18, 2022 that may be closed by this pull request
4 tasks
@james-chf james-chf linked an issue Nov 25, 2022 that may be closed by this pull request
4 tasks
tzemanovic added a commit that referenced this pull request Nov 25, 2022
* 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
@tzemanovic tzemanovic mentioned this pull request Nov 25, 2022
@james-chf
Copy link
Contributor Author

I've force pushed a rebase onto namada v0.10.1. The namada_tests crate is not compiling with abcipp and looks like it needs a shim, so I'm excluding getting that crate compiling from this PR as it may be more involved. Will attempt to try this PR out against the v0.11 draft branch (#793)

@@ -60,7 +68,7 @@ clippy-abcipp:
$(cargo) +$(nightly) clippy --all-targets \
--manifest-path ./shared/Cargo.toml \
--no-default-features \
--features "testing wasm-runtime abcipp ibc-mocks-abcipp" && \
--features "testing wasm-runtime abcipp ibc-mocks-abcipp ferveo-tpke" && \
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't actually need this ferveo-tpke feature it seems when this PR is merged for v0.11 as in #830

@juped juped merged commit 280339e into main Nov 30, 2022
@juped juped deleted the james/mainline/fix-abcipp branch November 30, 2022 07:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix compiling with abcipp and set up CI to check it
3 participants