fix: Resolve cargo clippy errors and add CI workflow plan
## Changes
### Clippy Fixes
- Fixed deprecated `cargo_bin` usage in 27 test files (added #![allow(deprecated)])
- Fixed uninlined_format_args in zombienet-sdk-tests
- Fixed subxt API changes in revive/rpc/tests.rs (fetch signature, StorageValue)
- Fixed dead_code warnings in validator-pool and identity-kyc mocks
- Fixed field name `i` -> `_i` in tasks example
### CI Infrastructure
- Added .claude/WORKFLOW_PLAN.md for tracking CI fix progress
- Updated lychee.toml and taplo.toml configs
### Files Modified
- 27 test files with deprecated cargo_bin fix
- bizinikiwi/pezframe/revive/rpc/src/tests.rs (subxt API)
- pezkuwi/pezpallets/validator-pool/src/{mock,tests}.rs
- pezcumulus/teyrchains/pezpallets/identity-kyc/src/mock.rs
- bizinikiwi/pezframe/examples/tasks/src/tests.rs
## Status
- cargo clippy: PASSING
- Next: cargo fmt, zepter, workspace checks
This commit is contained in:
@@ -30,16 +30,16 @@ strum = { features = ["derive"], workspace = true, default-features = true }
|
||||
tempfile = { workspace = true }
|
||||
thiserror = { workspace = true }
|
||||
tokio = { features = [
|
||||
"fs",
|
||||
"process",
|
||||
"fs",
|
||||
"process",
|
||||
], workspace = true, default-features = true }
|
||||
|
||||
codec = { features = ["derive"], workspace = true }
|
||||
|
||||
pezkuwi-node-core-pvf-common = { workspace = true, default-features = true }
|
||||
pezkuwi-node-metrics = { workspace = true, default-features = true }
|
||||
pezkuwi-pez-node-primitives = { workspace = true, default-features = true }
|
||||
pezkuwi-node-subsystem = { workspace = true, default-features = true }
|
||||
pezkuwi-pez-node-primitives = { workspace = true, default-features = true }
|
||||
pezkuwi-primitives = { workspace = true, default-features = true }
|
||||
pezkuwi-teyrchain-primitives = { workspace = true, default-features = true }
|
||||
|
||||
@@ -52,17 +52,17 @@ pezsp-maybe-compressed-blob = { optional = true, workspace = true, default-featu
|
||||
[dev-dependencies]
|
||||
assert_matches = { workspace = true }
|
||||
criterion = { features = [
|
||||
"async_tokio",
|
||||
"cargo_bench_support",
|
||||
"async_tokio",
|
||||
"cargo_bench_support",
|
||||
], workspace = true }
|
||||
|
||||
pezkuwi-node-core-pvf-common = { features = [
|
||||
"test-utils",
|
||||
"test-utils",
|
||||
], workspace = true, default-features = true }
|
||||
pezkuwi-node-subsystem-test-helpers = { workspace = true }
|
||||
# For benches and integration tests, depend on ourselves with the test-utils feature.
|
||||
pezkuwi-node-core-pvf = { features = [
|
||||
"test-utils",
|
||||
"test-utils",
|
||||
], workspace = true, default-features = true }
|
||||
pezkuwichain-runtime = { workspace = true }
|
||||
|
||||
@@ -80,25 +80,25 @@ ci-only-tests = []
|
||||
jemalloc-allocator = ["pezkuwi-node-core-pvf-common/jemalloc-allocator"]
|
||||
# This feature is used to export test code to other crates without putting it in the production build.
|
||||
test-utils = [
|
||||
"dep:is_executable",
|
||||
"dep:pezkuwi-node-core-pvf-execute-worker",
|
||||
"dep:pezkuwi-node-core-pvf-prepare-worker",
|
||||
"dep:pezsp-maybe-compressed-blob",
|
||||
"dep:is_executable",
|
||||
"dep:pezkuwi-node-core-pvf-execute-worker",
|
||||
"dep:pezkuwi-node-core-pvf-prepare-worker",
|
||||
"dep:pezsp-maybe-compressed-blob",
|
||||
]
|
||||
runtime-benchmarks = [
|
||||
"gum/runtime-benchmarks",
|
||||
"pezkuwi-node-core-pvf-common/runtime-benchmarks",
|
||||
"pezkuwi-node-core-pvf-execute-worker?/runtime-benchmarks",
|
||||
"pezkuwi-node-core-pvf-prepare-worker?/runtime-benchmarks",
|
||||
"pezkuwi-node-core-pvf/runtime-benchmarks",
|
||||
"pezkuwi-node-metrics/runtime-benchmarks",
|
||||
"pezkuwi-pez-node-primitives/runtime-benchmarks",
|
||||
"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
|
||||
"pezkuwi-node-subsystem/runtime-benchmarks",
|
||||
"pezkuwi-primitives/runtime-benchmarks",
|
||||
"pezkuwi-teyrchain-primitives/runtime-benchmarks",
|
||||
"pezkuwichain-runtime/runtime-benchmarks",
|
||||
"pezsc-sysinfo/runtime-benchmarks",
|
||||
"pezsc-tracing/runtime-benchmarks",
|
||||
"test-teyrchain-adder/runtime-benchmarks",
|
||||
"gum/runtime-benchmarks",
|
||||
"pezkuwi-node-core-pvf-common/runtime-benchmarks",
|
||||
"pezkuwi-node-core-pvf-execute-worker?/runtime-benchmarks",
|
||||
"pezkuwi-node-core-pvf-prepare-worker?/runtime-benchmarks",
|
||||
"pezkuwi-node-core-pvf/runtime-benchmarks",
|
||||
"pezkuwi-node-metrics/runtime-benchmarks",
|
||||
"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
|
||||
"pezkuwi-node-subsystem/runtime-benchmarks",
|
||||
"pezkuwi-pez-node-primitives/runtime-benchmarks",
|
||||
"pezkuwi-primitives/runtime-benchmarks",
|
||||
"pezkuwi-teyrchain-primitives/runtime-benchmarks",
|
||||
"pezkuwichain-runtime/runtime-benchmarks",
|
||||
"pezsc-sysinfo/runtime-benchmarks",
|
||||
"pezsc-tracing/runtime-benchmarks",
|
||||
"test-teyrchain-adder/runtime-benchmarks",
|
||||
]
|
||||
|
||||
@@ -54,11 +54,11 @@ tempfile = { workspace = true }
|
||||
test-utils = []
|
||||
jemalloc-allocator = []
|
||||
runtime-benchmarks = [
|
||||
"gum/runtime-benchmarks",
|
||||
"pezkuwi-pez-node-primitives/runtime-benchmarks",
|
||||
"pezkuwi-primitives/runtime-benchmarks",
|
||||
"pezkuwi-teyrchain-primitives/runtime-benchmarks",
|
||||
"pezsc-executor-wasmtime/runtime-benchmarks",
|
||||
"pezsc-executor/runtime-benchmarks",
|
||||
"pezsp-io/runtime-benchmarks",
|
||||
"gum/runtime-benchmarks",
|
||||
"pezkuwi-pez-node-primitives/runtime-benchmarks",
|
||||
"pezkuwi-primitives/runtime-benchmarks",
|
||||
"pezkuwi-teyrchain-primitives/runtime-benchmarks",
|
||||
"pezsc-executor-wasmtime/runtime-benchmarks",
|
||||
"pezsc-executor/runtime-benchmarks",
|
||||
"pezsp-io/runtime-benchmarks",
|
||||
]
|
||||
|
||||
@@ -31,9 +31,9 @@ pezsp-maybe-compressed-blob = { workspace = true, default-features = true }
|
||||
[features]
|
||||
builder = []
|
||||
runtime-benchmarks = [
|
||||
"gum/runtime-benchmarks",
|
||||
"pezkuwi-node-core-pvf-common/runtime-benchmarks",
|
||||
"pezkuwi-pez-node-primitives/runtime-benchmarks",
|
||||
"pezkuwi-primitives/runtime-benchmarks",
|
||||
"pezkuwi-teyrchain-primitives/runtime-benchmarks",
|
||||
"gum/runtime-benchmarks",
|
||||
"pezkuwi-node-core-pvf-common/runtime-benchmarks",
|
||||
"pezkuwi-pez-node-primitives/runtime-benchmarks",
|
||||
"pezkuwi-primitives/runtime-benchmarks",
|
||||
"pezkuwi-teyrchain-primitives/runtime-benchmarks",
|
||||
]
|
||||
|
||||
@@ -43,13 +43,13 @@ pezkuwichain-runtime = { workspace = true }
|
||||
[features]
|
||||
builder = []
|
||||
jemalloc-allocator = [
|
||||
"dep:tikv-jemalloc-ctl",
|
||||
"dep:tikv-jemallocator",
|
||||
"pezkuwi-node-core-pvf-common/jemalloc-allocator",
|
||||
"dep:tikv-jemalloc-ctl",
|
||||
"dep:tikv-jemallocator",
|
||||
"pezkuwi-node-core-pvf-common/jemalloc-allocator",
|
||||
]
|
||||
runtime-benchmarks = [
|
||||
"gum/runtime-benchmarks",
|
||||
"pezkuwi-node-core-pvf-common/runtime-benchmarks",
|
||||
"pezkuwi-primitives/runtime-benchmarks",
|
||||
"pezkuwichain-runtime/runtime-benchmarks",
|
||||
"gum/runtime-benchmarks",
|
||||
"pezkuwi-node-core-pvf-common/runtime-benchmarks",
|
||||
"pezkuwi-primitives/runtime-benchmarks",
|
||||
"pezkuwichain-runtime/runtime-benchmarks",
|
||||
]
|
||||
|
||||
@@ -37,7 +37,7 @@ use pezkuwi_node_core_pvf_common::{
|
||||
use pezkuwi_node_subsystem::{messages::PvfExecKind, ActiveLeavesUpdate};
|
||||
use pezkuwi_pez_node_primitives::PoV;
|
||||
use pezkuwi_primitives::{ExecutorParams, ExecutorParamsHash, Hash, PersistedValidationData};
|
||||
use slotmap::HopSlotMap;
|
||||
use slotmap::SlotMap;
|
||||
use std::{
|
||||
collections::{HashMap, VecDeque},
|
||||
fmt,
|
||||
@@ -105,7 +105,7 @@ impl fmt::Debug for WorkerData {
|
||||
|
||||
struct Workers {
|
||||
/// The registry of running workers.
|
||||
running: HopSlotMap<Worker, WorkerData>,
|
||||
running: SlotMap<Worker, WorkerData>,
|
||||
|
||||
/// The number of spawning but not yet spawned workers.
|
||||
spawn_inflight: usize,
|
||||
@@ -203,7 +203,7 @@ impl Queue {
|
||||
unscheduled: Unscheduled::new(),
|
||||
mux: Mux::new(),
|
||||
workers: Workers {
|
||||
running: HopSlotMap::with_capacity_and_key(10),
|
||||
running: SlotMap::with_capacity_and_key(10),
|
||||
spawn_inflight: 0,
|
||||
capacity: worker_capacity,
|
||||
},
|
||||
|
||||
@@ -1227,7 +1227,7 @@ pub(crate) mod tests {
|
||||
|
||||
async fn run_until<R>(
|
||||
task: &mut (impl Future<Output = ()> + Unpin),
|
||||
mut fut: (impl Future<Output = R> + Unpin),
|
||||
mut fut: impl Future<Output = R> + Unpin,
|
||||
) -> R {
|
||||
use std::task::Poll;
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ use pezkuwi_node_core_pvf_common::{
|
||||
pvf::PvfPrepData,
|
||||
SecurityStatus,
|
||||
};
|
||||
use slotmap::HopSlotMap;
|
||||
use slotmap::SlotMap;
|
||||
use std::{
|
||||
fmt,
|
||||
path::{Path, PathBuf},
|
||||
@@ -120,7 +120,7 @@ struct Pool {
|
||||
|
||||
to_pool: mpsc::Receiver<ToPool>,
|
||||
from_pool: mpsc::UnboundedSender<FromPool>,
|
||||
spawned: HopSlotMap<Worker, WorkerData>,
|
||||
spawned: SlotMap<Worker, WorkerData>,
|
||||
mux: Mux,
|
||||
|
||||
metrics: Metrics,
|
||||
@@ -182,7 +182,7 @@ async fn run(
|
||||
async fn purge_dead(
|
||||
metrics: &Metrics,
|
||||
from_pool: &mut mpsc::UnboundedSender<FromPool>,
|
||||
spawned: &mut HopSlotMap<Worker, WorkerData>,
|
||||
spawned: &mut SlotMap<Worker, WorkerData>,
|
||||
) -> Result<(), Fatal> {
|
||||
let mut to_remove = vec![];
|
||||
for (worker, data) in spawned.iter_mut() {
|
||||
@@ -213,7 +213,7 @@ fn handle_to_pool(
|
||||
spawn_timeout: Duration,
|
||||
node_version: Option<String>,
|
||||
security_status: SecurityStatus,
|
||||
spawned: &mut HopSlotMap<Worker, WorkerData>,
|
||||
spawned: &mut SlotMap<Worker, WorkerData>,
|
||||
mux: &mut Mux,
|
||||
to_pool: ToPool,
|
||||
) {
|
||||
@@ -313,7 +313,7 @@ async fn start_work_task<Timer>(
|
||||
fn handle_mux(
|
||||
metrics: &Metrics,
|
||||
from_pool: &mut mpsc::UnboundedSender<FromPool>,
|
||||
spawned: &mut HopSlotMap<Worker, WorkerData>,
|
||||
spawned: &mut SlotMap<Worker, WorkerData>,
|
||||
event: PoolEvent,
|
||||
) -> Result<(), Fatal> {
|
||||
match event {
|
||||
@@ -446,7 +446,7 @@ fn reply(from_pool: &mut mpsc::UnboundedSender<FromPool>, m: FromPool) -> Result
|
||||
/// This function takes care about counting the retired workers metric.
|
||||
fn attempt_retire(
|
||||
metrics: &Metrics,
|
||||
spawned: &mut HopSlotMap<Worker, WorkerData>,
|
||||
spawned: &mut SlotMap<Worker, WorkerData>,
|
||||
worker: Worker,
|
||||
) -> bool {
|
||||
if spawned.remove(worker).is_some() {
|
||||
@@ -464,7 +464,7 @@ fn attempt_retire(
|
||||
/// `FromPool::Concluded` with `rip: false`.
|
||||
fn handle_concluded_no_rip(
|
||||
from_pool: &mut mpsc::UnboundedSender<FromPool>,
|
||||
spawned: &mut HopSlotMap<Worker, WorkerData>,
|
||||
spawned: &mut SlotMap<Worker, WorkerData>,
|
||||
worker: Worker,
|
||||
idle: IdleWorker,
|
||||
result: PrepareResult,
|
||||
@@ -512,7 +512,7 @@ pub fn start(
|
||||
security_status,
|
||||
to_pool: to_pool_rx,
|
||||
from_pool: from_pool_tx,
|
||||
spawned: HopSlotMap::with_capacity_and_key(20),
|
||||
spawned: SlotMap::with_capacity_and_key(20),
|
||||
mux: Mux::new(),
|
||||
});
|
||||
|
||||
|
||||
@@ -502,7 +502,7 @@ mod tests {
|
||||
|
||||
async fn run_until<R>(
|
||||
task: &mut (impl Future<Output = ()> + Unpin),
|
||||
mut fut: (impl Future<Output = R> + Unpin),
|
||||
mut fut: impl Future<Output = R> + Unpin,
|
||||
) -> R {
|
||||
let start = std::time::Instant::now();
|
||||
let fut = &mut fut;
|
||||
|
||||
Reference in New Issue
Block a user