Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

PVF: Move PVF workers into separate crate #7101

Merged
paritytech-processbot merged 11 commits into from
Apr 21, 2023
Merged

PVF: Move PVF workers into separate crate #7101

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
08fe83a
Move PVF workers into separate crate
mrcnski Apr 19, 2023
7a32e8b
Fix indentation
mrcnski Apr 19, 2023
19c9c80
Fix compilation errors
mrcnski Apr 19, 2023
b00d3e8
Fix more compilation errors
mrcnski Apr 19, 2023
097771a
Rename `worker.rs` files, make host interface to worker more clear
mrcnski Apr 20, 2023
2c3ed9e
Fix more compilation errors
mrcnski Apr 20, 2023
f4e91de
Fix more compilation errors
mrcnski Apr 20, 2023
6402140
Merge branch 'master' into mrcnski/pvf-move-workers-to-separate-crate
mrcnski Apr 20, 2023
844b066
Add link to issue
mrcnski Apr 20, 2023
8ba1269
Address review comments
mrcnski Apr 20, 2023
25dbf32
Update comment
mrcnski Apr 21, 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
Prev Previous commit
Next Next commit
Fix more compilation errors
  • Loading branch information
@mrcnski
mrcnski committed Apr 20, 2023
commit f4e91de58c1088c7b4a44dbdf31c0fc7bbc31561
6 changes: 3 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion node/malus/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ polkadot-node-subsystem-types = { path = "../subsystem-types" }
polkadot-node-core-dispute-coordinator = { path = "../core/dispute-coordinator" }
polkadot-node-core-candidate-validation = { path = "../core/candidate-validation" }
polkadot-node-core-backing = { path = "../core/backing" }
polkadot-node-core-pvf-worker = { path = "../core/pvf/worker" }
polkadot-node-primitives = { path = "../primitives" }
polkadot-primitives = { path = "../../primitives" }
polkadot-node-core-pvf = { path = "../core/pvf" }
color-eyre = { version = "0.6.1", default-features = false }
assert_matches = "1.5"
async-trait = "0.1.57"
Expand Down
10 changes: 8 additions & 2 deletions node/malus/src/malus.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,10 @@ impl MalusCli {

#[cfg(not(target_os = "android"))]
{
polkadot_node_core_pvf::prepare_worker_entrypoint(&cmd.socket_path, None);
polkadot_node_core_pvf_worker::prepare_worker_entrypoint(
&cmd.socket_path,
None,
);
}
},
NemesisVariant::PvfExecuteWorker(cmd) => {
Expand All @@ -108,7 +111,10 @@ impl MalusCli {

#[cfg(not(target_os = "android"))]
{
polkadot_node_core_pvf::execute_worker_entrypoint(&cmd.socket_path, None);
polkadot_node_core_pvf_worker::execute_worker_entrypoint(
&cmd.socket_path,
None,
);
}
},
}
Expand Down
2 changes: 1 addition & 1 deletion parachain/test-parachains/adder/collator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ sc-service = { git = "https://github.com/paritytech/substrate", branch = "master
# This one is tricky. Even though it is not used directly by the collator, we still need it for the
# `puppet_worker` binary, which is required for the integration test. However, this shouldn't be
# a big problem since it is used transitively anyway.
polkadot-node-core-pvf = { path = "../../../../node/core/pvf" }
polkadot-node-core-pvf-worker = { path = "../../../../node/core/pvf/worker" }

[dev-dependencies]
polkadot-parachain = { path = "../../.." }
Expand Down
2 changes: 1 addition & 1 deletion parachain/test-parachains/adder/collator/bin/puppet_worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.

polkadot_node_core_pvf::decl_puppet_worker_main!();
polkadot_node_core_pvf_worker::decl_puppet_worker_main!();
2 changes: 1 addition & 1 deletion parachain/test-parachains/adder/collator/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ mod tests {
}

fn validate_collation(collator: &Collator, parent_head: HeadData, collation: Collation) {
use polkadot_node_core_pvf::testing::validate_candidate;
use polkadot_node_core_pvf_worker::testing::validate_candidate;

let block_data = match collation.proof_of_validity {
MaybeCompressedPoV::Raw(pov) => pov.block_data,
Expand Down
2 changes: 1 addition & 1 deletion parachain/test-parachains/undying/collator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ sc-service = { git = "https://github.com/paritytech/substrate", branch = "master
# This one is tricky. Even though it is not used directly by the collator, we still need it for the
# `puppet_worker` binary, which is required for the integration test. However, this shouldn't be
# a big problem since it is used transitively anyway.
polkadot-node-core-pvf = { path = "../../../../node/core/pvf" }
polkadot-node-core-pvf-worker = { path = "../../../../node/core/pvf/worker" }

[dev-dependencies]
polkadot-parachain = { path = "../../.." }
Expand Down
2 changes: 1 addition & 1 deletion parachain/test-parachains/undying/collator/bin/puppet_worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.

polkadot_node_core_pvf::decl_puppet_worker_main!();
polkadot_node_core_pvf_worker::decl_puppet_worker_main!();
2 changes: 1 addition & 1 deletion parachain/test-parachains/undying/collator/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ mod tests {
}

fn validate_collation(collator: &Collator, parent_head: HeadData, collation: Collation) {
use polkadot_node_core_pvf::testing::validate_candidate;
use polkadot_node_core_pvf_worker::testing::validate_candidate;

let block_data = match collation.proof_of_validity {
MaybeCompressedPoV::Raw(pov) => pov.block_data,
Expand Down