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.

Sign up for GitHub

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

PVF: Take back a stolen right #1207

Merged
merged 7 commits into from
Aug 31, 2023
Merged

PVF: Take back a stolen right #1207

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
043222a
PVF: Take back a stolen right
mrcnski Aug 28, 2023
1ebe092
Add missing `optional = true` for `sp-tracing`
mrcnski Aug 28, 2023
4342352
Abolish private ownership
mrcnski Aug 28, 2023
2a71649
Merge branch 'master' into mrcnski/pvf-take-back-a-stolen-right
mrcnski Aug 29, 2023
158c8d3
Merge branch 'master' into mrcnski/pvf-take-back-a-stolen-right
mrcnski Aug 30, 2023
5cc22a9
Remove capitalistic restriction on workers' right to trace
mrcnski Aug 30, 2023
9ca9fc0
Merge remote-tracking branch 'origin/mrcnski/pvf-take-back-a-stolen-r…
mrcnski Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion polkadot/node/core/pvf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ assert_matches = "1.4.0"
hex-literal = "0.3.4"
polkadot-node-core-pvf-common = { path = "common", features = ["test-utils"] }
# For the puppet worker, depend on ourselves with the test-utils feature.
polkadot-node-core-pvf = { path = "", features = ["test-utils"] }
polkadot-node-core-pvf = { path = ".", features = ["test-utils"] }

adder = { package = "test-parachain-adder", path = "../../../parachain/test-parachains/adder" }
halt = { package = "test-parachain-halt", path = "../../../parachain/test-parachains/halt" }
Expand Down
4 changes: 2 additions & 2 deletions polkadot/node/core/pvf/common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ sc-executor-wasmtime = { path = "../../../../../substrate/client/executor/wasmti
sp-core = { path = "../../../../../substrate/primitives/core" }
sp-externalities = { path = "../../../../../substrate/primitives/externalities" }
sp-io = { path = "../../../../../substrate/primitives/io" }
sp-tracing = { path = "../../../../../substrate/primitives/tracing" }
sp-tracing = { path = "../../../../../substrate/primitives/tracing", optional = true }

[target.'cfg(target_os = "linux")'.dependencies]
landlock = "0.2.0"
Expand All @@ -37,4 +37,4 @@ tempfile = "3.3.0"
[features]
# This feature is used to export test code to other crates without putting it in the production build.
# Also used for building the puppet worker.
test-utils = []
test-utils = ["sp-tracing"]
8 changes: 3 additions & 5 deletions polkadot/node/core/pvf/common/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,9 @@ pub mod worker;

pub use cpu_time::ProcessTime;

/// DO NOT USE - internal for macros only.
#[doc(hidden)]
pub mod __private {
pub use sp_tracing::try_init_simple;
}
// Used by `decl_worker_main!`.
#[cfg(feature = "test-utils")]
pub use sp_tracing;

const LOG_TARGET: &str = "parachain::pvf-common";

Expand Down
2 changes: 1 addition & 1 deletion polkadot/node/core/pvf/common/src/worker/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ macro_rules! decl_worker_main {
}

fn main() {
$crate::__private::try_init_simple();
$crate::sp_tracing::try_init_simple();

let args = std::env::args().collect::<Vec<_>>();
if args.len() == 1 {
Expand Down