This repository was archived by the owner on Nov 6, 2020. It is now read-only.
Conditionally compile ethcore public test helpers#8743
Merged
Conversation
debris
approved these changes
Jun 4, 2018
niklasad1
approved these changes
Jun 4, 2018
Collaborator
niklasad1
left a comment
There was a problem hiding this comment.
Looks good, but I would prefer a space to separate the features e.g, #[cfg(feature = "test-helper")] instead of #[cfg(feature="test-helper")]
Although, we are not completly consistent with that
➜ parity git:(na-updater-verification) ✗ gg "feature = " | wc -l
74
➜ parity git:(na-updater-verification) ✗ gg "feature=" | wc -l
9
Collaborator
Author
|
@niklasad1 Let me fix all those whitespace in this PR then. |
tomusdrw
approved these changes
Jun 4, 2018
ordian
added a commit
to ordian/parity
that referenced
this pull request
Jun 4, 2018
…rp_sync_on_light_client * 'master' of https://github.com/paritytech/parity: Conditionally compile ethcore public test helpers (openethereum#8743)
dvdplm
added a commit
that referenced
this pull request
Jun 7, 2018
…eric * origin/master: ethcore: fix ancient block error msg handling (#8832) CI: Fix docker tags (#8822) parity: fix indentation in sync logging (#8794) Removed obsolete IpcMode enum (#8819) Remove UI related settings from CLI (#8783) Remove windows tray and installer (#8778) docs: add changelogs for 1.10.6 and 1.11.3 (#8810) Fix ancient blocks queue deadlock (#8751) Disallow unsigned transactions in case EIP-86 is disabled (#8802) Fix evmbin compilation (#8795) Have space between feature cfg flag (#8791) rpc: fix address formatting in TransactionRequest Display (#8786) Conditionally compile ethcore public test helpers (#8743) Remove Result wrapper from AccountProvider in RPC impls (#8763) Update `license header` and `scripts` (#8666)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Partially address #8424. Related to #8371, rust-lang/cargo#2911, and rust-lang/cargo#1796.
This PR marks most of the specifications used only during test as
any(test, feature="test-helpers")so that it won't be built during a normal build against the main binary.In addition, it marks public test helpers exposed by
ethcoreto be compiled test only, and when the feature flagtest-helpersis enabled, so that it can be used for tests inethcore-syncandethcore-private-tx. Because of rust-lang/cargo#1796, when you compileethcore-syncorethcore-private-txonly, the dev dependencies features (in our case,test-helpersbyethcore) will actually be leaked to normal builds. However, some testing shows me that when building the main binary, the dev dependency feature won't be enabled. So it's still an improvement compared with now.No test features in the above case.
Have test features in this case.