Refactoring Checkpoint: (WIP)

This commit is contained in:
2025-12-14 10:29:31 +03:00
parent 09735eb97a
commit c89d7cac55
1424 changed files with 6415 additions and 6064 deletions
@@ -22,7 +22,7 @@ pezkuwi-approval-distribution = { workspace = true, default-features = true }
pezkuwi-node-core-approval-voting = { workspace = true, default-features = true }
pezkuwi-node-metrics = { workspace = true, default-features = true }
pezkuwi-node-network-protocol = { workspace = true, default-features = true }
pezkuwi-node-primitives = { workspace = true, default-features = true }
pezkuwi-pez-node-primitives = { workspace = true, default-features = true }
pezkuwi-node-subsystem = { workspace = true, default-features = true }
pezkuwi-node-subsystem-util = { workspace = true, default-features = true }
pezkuwi-overseer = { workspace = true, default-features = true }
@@ -51,7 +51,7 @@ runtime-benchmarks = [
"pezkuwi-node-core-approval-voting/runtime-benchmarks",
"pezkuwi-node-metrics/runtime-benchmarks",
"pezkuwi-node-network-protocol/runtime-benchmarks",
"pezkuwi-node-primitives/runtime-benchmarks",
"pezkuwi-pez-node-primitives/runtime-benchmarks",
"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
"pezkuwi-node-subsystem-util/runtime-benchmarks",
"pezkuwi-node-subsystem/runtime-benchmarks",
@@ -28,7 +28,7 @@ use pezkuwi_node_metrics::metered::{
UnboundedMeteredSender,
};
use pezkuwi_node_primitives::{
use pezkuwi_pez_node_primitives::{
approval::time::{Clock, SystemClock},
DISPUTE_WINDOW,
};
@@ -32,7 +32,7 @@ use futures::{channel::oneshot, future, stream::PollNext, StreamExt};
use itertools::Itertools;
use pezkuwi_node_core_approval_voting::{ApprovalVotingWorkProvider, Config};
use pezkuwi_node_network_protocol::{peer_set::ValidationVersion, ObservedRole, PeerId, View};
use pezkuwi_node_primitives::approval::{
use pezkuwi_pez_node_primitives::approval::{
time::SystemClock,
v1::RELAY_VRF_MODULO_CONTEXT,
v2::{
+2 -2
View File
@@ -32,7 +32,7 @@ schnellru = { workspace = true }
schnorrkel = { workspace = true, default-features = true }
thiserror = { workspace = true }
pezkuwi-node-primitives = { workspace = true, default-features = true }
pezkuwi-pez-node-primitives = { workspace = true, default-features = true }
pezkuwi-node-subsystem = { workspace = true, default-features = true }
pezkuwi-node-subsystem-util = { workspace = true, default-features = true }
pezkuwi-overseer = { workspace = true, default-features = true }
@@ -67,7 +67,7 @@ pezkuwi-subsystem-bench = { workspace = true }
subsystem-benchmarks = []
runtime-benchmarks = [
"gum/runtime-benchmarks",
"pezkuwi-node-primitives/runtime-benchmarks",
"pezkuwi-pez-node-primitives/runtime-benchmarks",
"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
"pezkuwi-node-subsystem-util/runtime-benchmarks",
"pezkuwi-node-subsystem/runtime-benchmarks",
@@ -17,14 +17,14 @@
//! Utilities for checking whether a candidate has been approved under a given block.
use bitvec::{order::Lsb0 as BitOrderLsb0, slice::BitSlice};
use pezkuwi_node_primitives::approval::v1::DelayTranche;
use pezkuwi_pez_node_primitives::approval::v1::DelayTranche;
use pezkuwi_primitives::ValidatorIndex;
use crate::{
persisted_entries::{ApprovalEntry, CandidateEntry, TrancheEntry},
MAX_RECORDED_NO_SHOW_VALIDATORS_PER_CANDIDATE,
};
use pezkuwi_node_primitives::approval::time::Tick;
use pezkuwi_pez_node_primitives::approval::time::Tick;
/// Result of counting the necessary tranches needed for approving a block.
#[derive(Debug, PartialEq, Clone)]
@@ -16,7 +16,7 @@
use bitvec::{order::Lsb0 as BitOrderLsb0, vec::BitVec};
use pezkuwi_node_primitives::approval::{
use pezkuwi_pez_node_primitives::approval::{
v1::{AssignmentCert, AssignmentCertKind, VrfProof, VrfSignature, RELAY_VRF_MODULO_CONTEXT},
v2::VrfPreOutput,
};
@@ -23,7 +23,7 @@
//! require a db migration (check `node/service/src/teyrchains_db/upgrade.rs`).
use codec::{Decode, Encode};
use pezkuwi_node_primitives::approval::v1::{AssignmentCert, DelayTranche};
use pezkuwi_pez_node_primitives::approval::v1::{AssignmentCert, DelayTranche};
use pezkuwi_primitives::{
BlockNumber, CandidateHash, CandidateReceiptV2 as CandidateReceipt, CoreIndex, GroupIndex,
Hash, SessionIndex, ValidatorIndex, ValidatorSignature,
@@ -24,7 +24,7 @@ use crate::{
backend::Backend,
};
use pezkuwi_node_primitives::approval::v1::AssignmentCertKind;
use pezkuwi_pez_node_primitives::approval::v1::AssignmentCertKind;
use pezkuwi_node_subsystem_util::database::Database;
use pezsp_application_crypto::pezsp_core::H256;
use std::{collections::HashSet, sync::Arc};
@@ -17,7 +17,7 @@
//! Version 2 of the DB schema.
use codec::{Decode, Encode};
use pezkuwi_node_primitives::approval::{v1::DelayTranche, v2::AssignmentCertV2};
use pezkuwi_pez_node_primitives::approval::{v1::DelayTranche, v2::AssignmentCertV2};
use pezkuwi_node_subsystem::{SubsystemError, SubsystemResult};
use pezkuwi_node_subsystem_util::database::{DBTransaction, Database};
use pezkuwi_primitives::{
@@ -24,7 +24,7 @@ use crate::{
},
backend::{Backend, V2ReadBackend},
};
use pezkuwi_node_primitives::approval::v1::AssignmentCertKind;
use pezkuwi_pez_node_primitives::approval::v1::AssignmentCertKind;
use pezkuwi_node_subsystem_util::database::Database;
use pezsp_application_crypto::pezsp_core::H256;
use std::{collections::HashSet, sync::Arc};
@@ -20,7 +20,7 @@
//! and adds a new field `pending_signatures` for `BlockEntry`
use codec::{Decode, Encode};
use pezkuwi_node_primitives::approval::v2::CandidateBitfield;
use pezkuwi_pez_node_primitives::approval::v2::CandidateBitfield;
use pezkuwi_node_subsystem::SubsystemResult;
use pezkuwi_node_subsystem_util::database::{DBTransaction, Database};
use pezkuwi_overseer::SubsystemError;
@@ -18,10 +18,10 @@
use codec::Encode;
use itertools::Itertools;
pub use pezkuwi_node_primitives::approval::criteria::{
pub use pezkuwi_pez_node_primitives::approval::criteria::{
AssignmentCriteria, Config, InvalidAssignment, InvalidAssignmentReason, OurAssignment,
};
use pezkuwi_node_primitives::approval::{
use pezkuwi_pez_node_primitives::approval::{
self as approval_types,
v1::{AssignmentCert, AssignmentCertKind, DelayTranche, RelayVRFStory},
v2::{
@@ -28,7 +28,7 @@
//!
//! We maintain a rolling window of session indices. This starts as empty
use pezkuwi_node_primitives::{
use pezkuwi_pez_node_primitives::{
approval::{
self as approval_types,
v1::{BlockApprovalMeta, RelayVRFStory},
@@ -65,7 +65,7 @@ use crate::{
persisted_entries::CandidateEntry,
};
use pezkuwi_node_primitives::approval::time::{slot_number_to_tick, Tick};
use pezkuwi_pez_node_primitives::approval::time::{slot_number_to_tick, Tick};
use super::{State, LOG_TARGET};
@@ -612,7 +612,7 @@ pub(crate) mod tests {
};
use approval_types::time::Clock;
use assert_matches::assert_matches;
use pezkuwi_node_primitives::{
use pezkuwi_pez_node_primitives::{
approval::v1::{VrfSignature, VrfTranscript},
DISPUTE_WINDOW,
};
@@ -689,7 +689,7 @@ pub(crate) mod tests {
fn compute_assignments(
&self,
_keystore: &LocalKeystore,
_relay_vrf_story: pezkuwi_node_primitives::approval::v1::RelayVRFStory,
_relay_vrf_story: pezkuwi_pez_node_primitives::approval::v1::RelayVRFStory,
_config: &criteria::Config,
_leaving_cores: Vec<(
CandidateHash,
@@ -704,13 +704,13 @@ pub(crate) mod tests {
fn check_assignment_cert(
&self,
_claimed_core_bitfield: pezkuwi_node_primitives::approval::v2::CoreBitfield,
_claimed_core_bitfield: pezkuwi_pez_node_primitives::approval::v2::CoreBitfield,
_validator_index: pezkuwi_primitives::ValidatorIndex,
_config: &criteria::Config,
_relay_vrf_story: pezkuwi_node_primitives::approval::v1::RelayVRFStory,
_assignment: &pezkuwi_node_primitives::approval::v2::AssignmentCertV2,
_relay_vrf_story: pezkuwi_pez_node_primitives::approval::v1::RelayVRFStory,
_assignment: &pezkuwi_pez_node_primitives::approval::v2::AssignmentCertV2,
_backing_groups: Vec<pezkuwi_primitives::GroupIndex>,
) -> Result<pezkuwi_node_primitives::approval::v1::DelayTranche, criteria::InvalidAssignment>
) -> Result<pezkuwi_pez_node_primitives::approval::v1::DelayTranche, criteria::InvalidAssignment>
{
Ok(0)
}
+2 -2
View File
@@ -22,7 +22,7 @@
//! been sufficiently approved to finalize.
use futures_timer::Delay;
use pezkuwi_node_primitives::{
use pezkuwi_pez_node_primitives::{
approval::{
v1::{BlockApprovalMeta, DelayTranche},
v2::{
@@ -92,7 +92,7 @@ use approval_checking::RequiredTranches;
use bitvec::{order::Lsb0, vec::BitVec};
pub use criteria::{AssignmentCriteria, Config as AssignmentConfig, RealAssignmentCriteria};
use persisted_entries::{ApprovalEntry, BlockEntry, CandidateEntry};
use pezkuwi_node_primitives::approval::time::{
use pezkuwi_pez_node_primitives::approval::time::{
slot_number_to_tick, Clock, ClockExt, DelayedApprovalTimer, SystemClock, Tick,
};
@@ -21,7 +21,7 @@
//! data and logic are intertwined.
use itertools::Itertools;
use pezkuwi_node_primitives::approval::{
use pezkuwi_pez_node_primitives::approval::{
v1::{DelayTranche, RelayVRFStory},
v2::{AssignmentCertV2, CandidateBitfield},
};
@@ -38,7 +38,7 @@ use crate::approval_db::v2::Bitfield;
use super::criteria::OurAssignment;
use pezkuwi_node_primitives::approval::time::Tick;
use pezkuwi_pez_node_primitives::approval::time::Tick;
/// Metadata regarding a specific tranche of assignments for a specific candidate.
#[derive(Debug, Clone, PartialEq)]
@@ -22,7 +22,7 @@ use overseer::prometheus::{
prometheus::{IntCounter, IntCounterVec},
Histogram, HistogramOpts, HistogramVec, Opts,
};
use pezkuwi_node_primitives::{
use pezkuwi_pez_node_primitives::{
approval::{
v1::{
AssignmentCert, AssignmentCertKind, DelayTranche, VrfPreOutput, VrfProof, VrfSignature,
@@ -239,7 +239,7 @@ where
fn compute_assignments(
&self,
_keystore: &LocalKeystore,
_relay_vrf_story: pezkuwi_node_primitives::approval::v1::RelayVRFStory,
_relay_vrf_story: pezkuwi_pez_node_primitives::approval::v1::RelayVRFStory,
_config: &criteria::Config,
_leaving_cores: Vec<(
CandidateHash,
@@ -253,13 +253,13 @@ where
fn check_assignment_cert(
&self,
_claimed_core_bitfield: pezkuwi_node_primitives::approval::v2::CoreBitfield,
_claimed_core_bitfield: pezkuwi_pez_node_primitives::approval::v2::CoreBitfield,
validator_index: ValidatorIndex,
_config: &criteria::Config,
_relay_vrf_story: pezkuwi_node_primitives::approval::v1::RelayVRFStory,
_assignment: &pezkuwi_node_primitives::approval::v2::AssignmentCertV2,
_relay_vrf_story: pezkuwi_pez_node_primitives::approval::v1::RelayVRFStory,
_assignment: &pezkuwi_pez_node_primitives::approval::v2::AssignmentCertV2,
_backing_groups: Vec<pezkuwi_primitives::GroupIndex>,
) -> Result<pezkuwi_node_primitives::approval::v1::DelayTranche, criteria::InvalidAssignment> {
) -> Result<pezkuwi_pez_node_primitives::approval::v1::DelayTranche, criteria::InvalidAssignment> {
self.1(validator_index)
}
}
+2 -2
View File
@@ -21,7 +21,7 @@ thiserror = { workspace = true }
codec = { features = ["derive"], workspace = true, default-features = true }
pezkuwi-erasure-coding = { workspace = true, default-features = true }
pezkuwi-node-primitives = { workspace = true, default-features = true }
pezkuwi-pez-node-primitives = { workspace = true, default-features = true }
pezkuwi-node-subsystem = { workspace = true, default-features = true }
pezkuwi-node-subsystem-util = { workspace = true, default-features = true }
pezkuwi-primitives = { workspace = true, default-features = true }
@@ -42,7 +42,7 @@ pezsp-keyring = { workspace = true, default-features = true }
runtime-benchmarks = [
"gum/runtime-benchmarks",
"pezkuwi-erasure-coding/runtime-benchmarks",
"pezkuwi-node-primitives/runtime-benchmarks",
"pezkuwi-pez-node-primitives/runtime-benchmarks",
"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
"pezkuwi-node-subsystem-util/runtime-benchmarks",
"pezkuwi-node-subsystem/runtime-benchmarks",
+1 -1
View File
@@ -39,7 +39,7 @@ use pezkuwi_node_subsystem_util::database::{DBTransaction, Database};
use pezsp_consensus::SyncOracle;
use bitvec::{order::Lsb0 as BitOrderLsb0, vec::BitVec};
use pezkuwi_node_primitives::{AvailableData, ErasureChunk};
use pezkuwi_pez_node_primitives::{AvailableData, ErasureChunk};
use pezkuwi_node_subsystem::{
errors::{ChainApiError, RuntimeApiError},
messages::{AvailabilityStoreMessage, ChainApiMessage, StoreAvailableDataError},
+1 -1
View File
@@ -22,7 +22,7 @@ use util::availability_chunks::availability_chunk_index;
use self::test_helpers::mock::new_leaf;
use parking_lot::Mutex;
use pezkuwi_node_primitives::{AvailableData, BlockData, PoV, Proof};
use pezkuwi_pez_node_primitives::{AvailableData, BlockData, PoV, Proof};
use pezkuwi_node_subsystem::{
errors::RuntimeApiError,
messages::{AllMessages, RuntimeApiMessage, RuntimeApiRequest},
+2 -2
View File
@@ -18,7 +18,7 @@ fatality = { workspace = true }
futures = { workspace = true }
gum = { workspace = true, default-features = true }
pezkuwi-erasure-coding = { workspace = true, default-features = true }
pezkuwi-node-primitives = { workspace = true, default-features = true }
pezkuwi-pez-node-primitives = { workspace = true, default-features = true }
pezkuwi-node-subsystem = { workspace = true, default-features = true }
pezkuwi-node-subsystem-util = { workspace = true, default-features = true }
pezkuwi-primitives = { workspace = true, default-features = true }
@@ -44,7 +44,7 @@ pezsp-tracing = { workspace = true, default-features = true }
runtime-benchmarks = [
"gum/runtime-benchmarks",
"pezkuwi-erasure-coding/runtime-benchmarks",
"pezkuwi-node-primitives/runtime-benchmarks",
"pezkuwi-pez-node-primitives/runtime-benchmarks",
"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
"pezkuwi-node-subsystem-util/runtime-benchmarks",
"pezkuwi-node-subsystem/runtime-benchmarks",
+1 -1
View File
@@ -80,7 +80,7 @@ use futures::{
use schnellru::{ByLength, LruMap};
use error::{Error, FatalResult};
use pezkuwi_node_primitives::{
use pezkuwi_pez_node_primitives::{
AvailableData, InvalidCandidate, PoV, SignedFullStatementWithPVD, StatementWithPVD,
ValidationResult,
};
+1 -1
View File
@@ -17,7 +17,7 @@
use super::*;
use assert_matches::assert_matches;
use futures::{future, Future};
use pezkuwi_node_primitives::{BlockData, InvalidCandidate, SignedFullStatement, Statement};
use pezkuwi_pez_node_primitives::{BlockData, InvalidCandidate, SignedFullStatement, Statement};
use pezkuwi_node_subsystem::{
messages::{
AllMessages, ChainApiMessage, CollatorProtocolMessage, HypotheticalMembership, PvfExecKind,
@@ -23,7 +23,7 @@ pezsp-application-crypto = { workspace = true }
pezsp-keystore = { workspace = true }
pezkuwi-node-metrics = { workspace = true, default-features = true }
pezkuwi-node-primitives = { workspace = true, default-features = true }
pezkuwi-pez-node-primitives = { workspace = true, default-features = true }
pezkuwi-node-subsystem = { workspace = true, default-features = true }
pezkuwi-node-subsystem-util = { workspace = true, default-features = true }
pezkuwi-overseer = { workspace = true, default-features = true }
@@ -49,7 +49,7 @@ runtime-benchmarks = [
"gum/runtime-benchmarks",
"pezkuwi-node-core-pvf/runtime-benchmarks",
"pezkuwi-node-metrics/runtime-benchmarks",
"pezkuwi-node-primitives/runtime-benchmarks",
"pezkuwi-pez-node-primitives/runtime-benchmarks",
"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
"pezkuwi-node-subsystem-util/runtime-benchmarks",
"pezkuwi-node-subsystem/runtime-benchmarks",
@@ -27,7 +27,7 @@ use pezkuwi_node_core_pvf::{
InternalValidationError, InvalidCandidate as WasmInvalidCandidate, PossiblyInvalidError,
PrepareError, PrepareJobKind, PvfPrepData, ValidationError, ValidationHost,
};
use pezkuwi_node_primitives::{InvalidCandidate, PoV, ValidationResult};
use pezkuwi_pez_node_primitives::{InvalidCandidate, PoV, ValidationResult};
use pezkuwi_node_subsystem::{
errors::RuntimeApiError,
messages::{
@@ -24,7 +24,7 @@ use crate::PvfExecKind;
use assert_matches::assert_matches;
use futures::executor;
use pezkuwi_node_core_pvf::PrepareError;
use pezkuwi_node_primitives::BlockData;
use pezkuwi_pez_node_primitives::BlockData;
use pezkuwi_node_subsystem::messages::AllMessages;
use pezkuwi_node_subsystem_test_helpers::{make_subsystem_context, TestSubsystemContextHandle};
use pezkuwi_node_subsystem_util::reexports::SubsystemContext;
+2 -2
View File
@@ -25,7 +25,7 @@ pezsc-consensus-babe = { workspace = true, default-features = true }
codec = { workspace = true, default-features = true }
futures = { features = ["thread-pool"], workspace = true }
maplit = { workspace = true }
pezkuwi-node-primitives = { workspace = true, default-features = true }
pezkuwi-pez-node-primitives = { workspace = true, default-features = true }
pezkuwi-node-subsystem-test-helpers = { workspace = true }
pezkuwi-primitives = { workspace = true, default-features = true }
pezsp-blockchain = { workspace = true, default-features = true }
@@ -35,7 +35,7 @@ pezsp-core = { workspace = true, default-features = true }
runtime-benchmarks = [
"gum/runtime-benchmarks",
"pezkuwi-node-metrics/runtime-benchmarks",
"pezkuwi-node-primitives/runtime-benchmarks",
"pezkuwi-pez-node-primitives/runtime-benchmarks",
"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
"pezkuwi-node-subsystem-types/runtime-benchmarks",
"pezkuwi-node-subsystem/runtime-benchmarks",
+1 -1
View File
@@ -20,7 +20,7 @@ use codec::Encode;
use futures::{channel::oneshot, future::BoxFuture};
use std::collections::BTreeMap;
use pezkuwi_node_primitives::BlockWeight;
use pezkuwi_pez_node_primitives::BlockWeight;
use pezkuwi_node_subsystem_test_helpers::{make_subsystem_context, TestSubsystemContextHandle};
use pezkuwi_node_subsystem_types::ChainApiBackend;
use pezkuwi_primitives::{Block, BlockNumber, Hash, Header};
+2 -2
View File
@@ -17,7 +17,7 @@ codec = { workspace = true, default-features = true }
futures = { workspace = true }
futures-timer = { workspace = true }
gum = { workspace = true, default-features = true }
pezkuwi-node-primitives = { workspace = true, default-features = true }
pezkuwi-pez-node-primitives = { workspace = true, default-features = true }
pezkuwi-node-subsystem = { workspace = true, default-features = true }
pezkuwi-node-subsystem-util = { workspace = true, default-features = true }
pezkuwi-primitives = { workspace = true, default-features = true }
@@ -33,7 +33,7 @@ pezsp-core = { workspace = true, default-features = true }
[features]
runtime-benchmarks = [
"gum/runtime-benchmarks",
"pezkuwi-node-primitives/runtime-benchmarks",
"pezkuwi-pez-node-primitives/runtime-benchmarks",
"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
"pezkuwi-node-subsystem-util/runtime-benchmarks",
"pezkuwi-node-subsystem/runtime-benchmarks",
@@ -37,7 +37,7 @@ use crate::{
Error,
};
use pezkuwi_node_primitives::BlockWeight;
use pezkuwi_pez_node_primitives::BlockWeight;
use pezkuwi_primitives::{BlockNumber, Hash};
use codec::{Decode, Encode};
+1 -1
View File
@@ -16,7 +16,7 @@
//! Implements the Chain Selection Subsystem.
use pezkuwi_node_primitives::BlockWeight;
use pezkuwi_pez_node_primitives::BlockWeight;
use pezkuwi_node_subsystem::{
errors::ChainApiError,
messages::{ChainApiMessage, ChainSelectionMessage},
@@ -23,7 +23,7 @@
//! Each direct descendant of the finalized block acts as its own sub-tree,
//! and as the finalized block advances, orphaned sub-trees are entirely pruned.
use pezkuwi_node_primitives::BlockWeight;
use pezkuwi_pez_node_primitives::BlockWeight;
use pezkuwi_node_subsystem::ChainApiError;
use pezkuwi_primitives::{BlockNumber, Hash};
@@ -26,7 +26,7 @@ gum = { workspace = true, default-features = true }
schnellru = { workspace = true }
thiserror = { workspace = true }
pezkuwi-node-primitives = { workspace = true, default-features = true }
pezkuwi-pez-node-primitives = { workspace = true, default-features = true }
pezkuwi-node-subsystem = { workspace = true, default-features = true }
pezkuwi-node-subsystem-util = { workspace = true, default-features = true }
pezkuwi-primitives = { workspace = true, default-features = true }
@@ -54,7 +54,7 @@ disputes = []
subsystem-benchmarks = []
runtime-benchmarks = [
"gum/runtime-benchmarks",
"pezkuwi-node-primitives/runtime-benchmarks",
"pezkuwi-pez-node-primitives/runtime-benchmarks",
"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
"pezkuwi-node-subsystem-util/runtime-benchmarks",
"pezkuwi-node-subsystem/runtime-benchmarks",
@@ -22,7 +22,7 @@
//! the dispute data in the database. Any breaking changes here will still
//! require a db migration (check `node/service/src/teyrchains_db/upgrade.rs`).
use pezkuwi_node_primitives::DisputeStatus;
use pezkuwi_pez_node_primitives::DisputeStatus;
use pezkuwi_node_subsystem_util::database::{DBTransaction, Database};
use pezkuwi_primitives::{
CandidateHash, CandidateReceiptV2 as CandidateReceipt, Hash, InvalidDisputeStatementKind,
@@ -225,9 +225,9 @@ pub struct CandidateVotes {
pub invalid: Vec<(InvalidDisputeStatementKind, ValidatorIndex, ValidatorSignature)>,
}
impl From<CandidateVotes> for pezkuwi_node_primitives::CandidateVotes {
fn from(db_votes: CandidateVotes) -> pezkuwi_node_primitives::CandidateVotes {
pezkuwi_node_primitives::CandidateVotes {
impl From<CandidateVotes> for pezkuwi_pez_node_primitives::CandidateVotes {
fn from(db_votes: CandidateVotes) -> pezkuwi_pez_node_primitives::CandidateVotes {
pezkuwi_pez_node_primitives::CandidateVotes {
candidate_receipt: db_votes.candidate_receipt,
valid: db_votes.valid.into_iter().map(|(kind, i, sig)| (i, (kind, sig))).collect(),
invalid: db_votes.invalid.into_iter().map(|(kind, i, sig)| (i, (kind, sig))).collect(),
@@ -235,8 +235,8 @@ impl From<CandidateVotes> for pezkuwi_node_primitives::CandidateVotes {
}
}
impl From<pezkuwi_node_primitives::CandidateVotes> for CandidateVotes {
fn from(primitive_votes: pezkuwi_node_primitives::CandidateVotes) -> CandidateVotes {
impl From<pezkuwi_pez_node_primitives::CandidateVotes> for CandidateVotes {
fn from(primitive_votes: pezkuwi_pez_node_primitives::CandidateVotes) -> CandidateVotes {
CandidateVotes {
candidate_receipt: primitive_votes.candidate_receipt,
valid: primitive_votes
@@ -375,7 +375,7 @@ fn load_cleaned_votes_watermark(
mod tests {
use super::*;
use pezkuwi_node_primitives::DISPUTE_WINDOW;
use pezkuwi_pez_node_primitives::DISPUTE_WINDOW;
use pezkuwi_primitives::{Hash, Id as ParaId};
use pezkuwi_primitives_test_helpers::{
dummy_candidate_receipt, dummy_candidate_receipt_v2, dummy_hash,
@@ -28,7 +28,7 @@
use std::collections::{BTreeMap, HashMap, HashSet};
use pezkuwi_node_primitives::{
use pezkuwi_pez_node_primitives::{
disputes::ValidCandidateVotes, CandidateVotes, DisputeStatus, SignedDisputeStatement, Timestamp,
};
use pezkuwi_node_subsystem::overseer;
@@ -28,7 +28,7 @@ use futures::{
use pezsc_keystore::LocalKeystore;
use pezkuwi_node_primitives::{
use pezkuwi_pez_node_primitives::{
disputes::ValidCandidateVotes, CandidateVotes, DisputeStatus, SignedDisputeStatement,
Timestamp, DISPUTE_WINDOW,
};
@@ -33,7 +33,7 @@ use futures::FutureExt;
use gum::CandidateHash;
use pezsc_keystore::LocalKeystore;
use pezkuwi_node_primitives::{
use pezkuwi_pez_node_primitives::{
CandidateVotes, DisputeMessage, DisputeMessageCheckError, SignedDisputeStatement,
DISPUTE_WINDOW,
};
@@ -25,7 +25,7 @@ use futures::{
#[cfg(test)]
use futures_timer::Delay;
use pezkuwi_node_primitives::ValidationResult;
use pezkuwi_pez_node_primitives::ValidationResult;
use pezkuwi_node_subsystem::{
messages::{AvailabilityRecoveryMessage, CandidateValidationMessage, PvfExecKind},
overseer, ActiveLeavesUpdate, RecoveryError,
@@ -23,7 +23,7 @@ use pezsp_core::testing::TaskExecutor;
use super::*;
use codec::Encode;
use pezkuwi_node_primitives::{AvailableData, BlockData, InvalidCandidate, PoV};
use pezkuwi_pez_node_primitives::{AvailableData, BlockData, InvalidCandidate, PoV};
use pezkuwi_node_subsystem::{
messages::{
AllMessages, ChainApiMessage, DisputeCoordinatorMessage, PvfExecKind, RuntimeApiMessage,
@@ -19,7 +19,7 @@ use std::collections::{btree_map::Entry, BTreeMap, HashSet};
use futures::channel::oneshot;
use schnellru::{ByLength, LruMap};
use pezkuwi_node_primitives::{DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION, MAX_FINALITY_LAG};
use pezkuwi_pez_node_primitives::{DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION, MAX_FINALITY_LAG};
use pezkuwi_node_subsystem::{
messages::ChainApiMessage, overseer, ActivatedLeaf, ActiveLeavesUpdate, ChainApiError,
RuntimeApiError, SubsystemSender,
@@ -22,7 +22,7 @@ use codec::Encode;
use futures::future::join;
use pezsp_core::testing::TaskExecutor;
use pezkuwi_node_primitives::DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION;
use pezkuwi_pez_node_primitives::DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION;
use pezkuwi_node_subsystem::{
messages::{
AllMessages, ChainApiMessage, DisputeCoordinatorMessage, RuntimeApiMessage,
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Pezkuwi. If not, see <http://www.gnu.org/licenses/>.
use pezkuwi_node_primitives::{dispute_is_inactive, DisputeStatus, Timestamp};
use pezkuwi_pez_node_primitives::{dispute_is_inactive, DisputeStatus, Timestamp};
use pezkuwi_primitives::{CandidateHash, SessionIndex};
use std::time::{SystemTime, UNIX_EPOCH};
@@ -31,7 +31,7 @@ use futures::{
use pezkuwi_node_subsystem_util::database::Database;
use pezkuwi_node_primitives::{
use pezkuwi_pez_node_primitives::{
DisputeMessage, DisputeStatus, SignedDisputeStatement, SignedFullStatement, Statement,
DISPUTE_WINDOW,
};
@@ -51,7 +51,7 @@ use pezsp_core::{sr25519::Pair, testing::TaskExecutor, Pair as PairT};
use pezsp_keyring::Sr25519Keyring;
use pezsp_keystore::{Keystore, KeystorePtr};
use pezkuwi_node_primitives::{Timestamp, ACTIVE_DURATION_SECS};
use pezkuwi_pez_node_primitives::{Timestamp, ACTIVE_DURATION_SECS};
use pezkuwi_node_subsystem::{
messages::{AllMessages, BlockDescription, RuntimeApiMessage, RuntimeApiRequest},
ActiveLeavesUpdate,
+2 -2
View File
@@ -18,7 +18,7 @@ fatality = { workspace = true }
futures = { workspace = true }
futures-timer = { workspace = true }
gum = { workspace = true, default-features = true }
pezkuwi-node-primitives = { workspace = true, default-features = true }
pezkuwi-pez-node-primitives = { workspace = true, default-features = true }
pezkuwi-node-subsystem = { workspace = true, default-features = true }
pezkuwi-node-subsystem-util = { workspace = true, default-features = true }
pezkuwi-primitives = { workspace = true, default-features = true }
@@ -36,7 +36,7 @@ pezsp-keystore = { workspace = true, default-features = true }
[features]
runtime-benchmarks = [
"gum/runtime-benchmarks",
"pezkuwi-node-primitives/runtime-benchmarks",
"pezkuwi-pez-node-primitives/runtime-benchmarks",
"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
"pezkuwi-node-subsystem-util/runtime-benchmarks",
"pezkuwi-node-subsystem/runtime-benchmarks",
@@ -19,7 +19,7 @@
use crate::LOG_TARGET;
use futures::channel::oneshot;
use pezkuwi_node_primitives::CandidateVotes;
use pezkuwi_pez_node_primitives::CandidateVotes;
use pezkuwi_node_subsystem::{messages::DisputeCoordinatorMessage, overseer};
use pezkuwi_primitives::{CandidateHash, SessionIndex};
@@ -20,7 +20,7 @@
use crate::{error::GetOnchainDisputesError, metrics, LOG_TARGET};
use futures::channel::oneshot;
use pezkuwi_node_primitives::{dispute_is_inactive, CandidateVotes, DisputeStatus, Timestamp};
use pezkuwi_pez_node_primitives::{dispute_is_inactive, CandidateVotes, DisputeStatus, Timestamp};
use pezkuwi_node_subsystem::{
errors::RuntimeApiError,
messages::{DisputeCoordinatorMessage, RuntimeApiMessage, RuntimeApiRequest},
@@ -20,7 +20,7 @@ use super::super::{
};
use bitvec::prelude::*;
use futures::channel::mpsc;
use pezkuwi_node_primitives::{CandidateVotes, DisputeStatus, ACTIVE_DURATION_SECS};
use pezkuwi_pez_node_primitives::{CandidateVotes, DisputeStatus, ACTIVE_DURATION_SECS};
use pezkuwi_node_subsystem::messages::{
AllMessages, DisputeCoordinatorMessage, RuntimeApiMessage, RuntimeApiRequest,
};
+2 -2
View File
@@ -38,7 +38,7 @@ codec = { features = ["derive"], workspace = true }
pezkuwi-node-core-pvf-common = { workspace = true, default-features = true }
pezkuwi-node-metrics = { workspace = true, default-features = true }
pezkuwi-node-primitives = { workspace = true, default-features = true }
pezkuwi-pez-node-primitives = { workspace = true, default-features = true }
pezkuwi-node-subsystem = { workspace = true, default-features = true }
pezkuwi-primitives = { workspace = true, default-features = true }
pezkuwi-teyrchain-primitives = { workspace = true, default-features = true }
@@ -92,7 +92,7 @@ runtime-benchmarks = [
"pezkuwi-node-core-pvf-prepare-worker?/runtime-benchmarks",
"pezkuwi-node-core-pvf/runtime-benchmarks",
"pezkuwi-node-metrics/runtime-benchmarks",
"pezkuwi-node-primitives/runtime-benchmarks",
"pezkuwi-pez-node-primitives/runtime-benchmarks",
"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
"pezkuwi-node-subsystem/runtime-benchmarks",
"pezkuwi-primitives/runtime-benchmarks",
+2 -2
View File
@@ -22,7 +22,7 @@ thiserror = { workspace = true }
codec = { features = ["derive"], workspace = true }
pezkuwi-node-primitives = { 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 }
@@ -55,7 +55,7 @@ test-utils = []
jemalloc-allocator = []
runtime-benchmarks = [
"gum/runtime-benchmarks",
"pezkuwi-node-primitives/runtime-benchmarks",
"pezkuwi-pez-node-primitives/runtime-benchmarks",
"pezkuwi-primitives/runtime-benchmarks",
"pezkuwi-teyrchain-primitives/runtime-benchmarks",
"pezsc-executor-wasmtime/runtime-benchmarks",
+1 -1
View File
@@ -16,7 +16,7 @@
use crate::{error::InternalValidationError, ArtifactChecksum};
use codec::{Decode, Encode};
use pezkuwi_node_primitives::PoV;
use pezkuwi_pez_node_primitives::PoV;
use pezkuwi_primitives::{ExecutorParams, PersistedValidationData};
use pezkuwi_teyrchain_primitives::primitives::ValidationResult;
use std::time::Duration;
@@ -22,7 +22,7 @@ nix = { features = ["process", "resource", "sched"], workspace = true }
codec = { features = ["derive"], workspace = true }
pezkuwi-node-core-pvf-common = { workspace = true, default-features = true }
pezkuwi-node-primitives = { 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 }
@@ -33,7 +33,7 @@ builder = []
runtime-benchmarks = [
"gum/runtime-benchmarks",
"pezkuwi-node-core-pvf-common/runtime-benchmarks",
"pezkuwi-node-primitives/runtime-benchmarks",
"pezkuwi-pez-node-primitives/runtime-benchmarks",
"pezkuwi-primitives/runtime-benchmarks",
"pezkuwi-teyrchain-primitives/runtime-benchmarks",
]
@@ -52,7 +52,7 @@ use pezkuwi_node_core_pvf_common::{
},
worker_dir, ArtifactChecksum,
};
use pezkuwi_node_primitives::{BlockData, PoV, POV_BOMB_LIMIT};
use pezkuwi_pez_node_primitives::{BlockData, PoV, POV_BOMB_LIMIT};
use pezkuwi_primitives::{ExecutorParams, PersistedValidationData};
use pezkuwi_teyrchain_primitives::primitives::ValidationResult;
use std::{
+2 -2
View File
@@ -34,7 +34,7 @@ use pezkuwi_node_core_pvf_common::{
execute::{JobResponse, WorkerError, WorkerResponse},
SecurityStatus,
};
use pezkuwi_node_primitives::PoV;
use pezkuwi_pez_node_primitives::PoV;
use pezkuwi_node_subsystem::{messages::PvfExecKind, ActiveLeavesUpdate};
use pezkuwi_primitives::{ExecutorParams, ExecutorParamsHash, Hash, PersistedValidationData};
use slotmap::HopSlotMap;
@@ -908,7 +908,7 @@ impl Unscheduled {
#[cfg(test)]
mod tests {
use pezkuwi_node_primitives::BlockData;
use pezkuwi_pez_node_primitives::BlockData;
use pezkuwi_node_subsystem_test_helpers::mock::new_leaf;
use pezsp_core::H256;
@@ -32,7 +32,7 @@ use pezkuwi_node_core_pvf_common::{
execute::{Handshake, WorkerError, WorkerResponse},
worker_dir, ArtifactChecksum, SecurityStatus,
};
use pezkuwi_node_primitives::PoV;
use pezkuwi_pez_node_primitives::PoV;
use pezkuwi_primitives::{ExecutorParams, PersistedValidationData};
use std::{path::Path, sync::Arc, time::Duration};
use tokio::{io, net::UnixStream};
+2 -2
View File
@@ -38,7 +38,7 @@ use pezkuwi_node_core_pvf_common::{
prepare::PrepareSuccess,
pvf::PvfPrepData,
};
use pezkuwi_node_primitives::PoV;
use pezkuwi_pez_node_primitives::PoV;
use pezkuwi_node_subsystem::{
messages::PvfExecKind, ActiveLeavesUpdate, SubsystemError, SubsystemResult,
};
@@ -1054,7 +1054,7 @@ pub(crate) mod tests {
use crate::{artifacts::generate_artifact_path, testing::artifact_id, PossiblyInvalidError};
use assert_matches::assert_matches;
use futures::future::BoxFuture;
use pezkuwi_node_primitives::BlockData;
use pezkuwi_pez_node_primitives::BlockData;
use pezsp_core::H256;
const TEST_EXECUTION_TIMEOUT: Duration = Duration::from_secs(3);
+1 -1
View File
@@ -24,7 +24,7 @@ pub use crate::{
use crate::{artifacts::ArtifactId, get_worker_version};
use is_executable::IsExecutable;
use pezkuwi_node_core_pvf_common::pvf::PvfPrepData;
use pezkuwi_node_primitives::NODE_VERSION;
use pezkuwi_pez_node_primitives::NODE_VERSION;
use pezkuwi_primitives::ExecutorParams;
use std::{
path::PathBuf,
+1 -1
View File
@@ -18,7 +18,7 @@
use super::TestHost;
use codec::{Decode, Encode};
use pezkuwi_node_primitives::PoV;
use pezkuwi_pez_node_primitives::PoV;
use pezkuwi_primitives::PersistedValidationData;
use pezkuwi_teyrchain_primitives::primitives::{
BlockData as GenericBlockData, HeadData as GenericHeadData,
+1 -1
View File
@@ -25,7 +25,7 @@ use pezkuwi_node_core_pvf::{
ValidationHost, JOB_TIMEOUT_WALL_CLOCK_FACTOR,
};
use pezkuwi_node_core_pvf_common::{compute_checksum, ArtifactChecksum};
use pezkuwi_node_primitives::{PoV, POV_BOMB_LIMIT};
use pezkuwi_pez_node_primitives::{PoV, POV_BOMB_LIMIT};
use pezkuwi_node_subsystem::messages::PvfExecKind;
use pezkuwi_primitives::{
ExecutorParam, ExecutorParams, Hash, PersistedValidationData, PvfExecKind as RuntimePvfExecKind,
+1 -1
View File
@@ -23,7 +23,7 @@ use codec::Encode;
use pezkuwi_node_core_pvf::{
InvalidCandidate, PossiblyInvalidError, PrepareError, ValidationError,
};
use pezkuwi_node_primitives::PoV;
use pezkuwi_pez_node_primitives::PoV;
use pezkuwi_primitives::PersistedValidationData;
use pezkuwi_teyrchain_primitives::primitives::{
BlockData as GenericBlockData, HeadData as GenericHeadData,
+2 -2
View File
@@ -27,7 +27,7 @@ pezkuwi-primitives = { workspace = true, default-features = true }
[dev-dependencies]
async-trait = { workspace = true }
futures = { features = ["thread-pool"], workspace = true }
pezkuwi-node-primitives = { workspace = true, default-features = true }
pezkuwi-pez-node-primitives = { workspace = true, default-features = true }
pezkuwi-node-subsystem-test-helpers = { workspace = true }
pezkuwi-primitives-test-helpers = { workspace = true }
pezsp-api = { workspace = true, default-features = true }
@@ -38,7 +38,7 @@ pezsp-keyring = { workspace = true, default-features = true }
runtime-benchmarks = [
"gum/runtime-benchmarks",
"pezkuwi-node-metrics/runtime-benchmarks",
"pezkuwi-node-primitives/runtime-benchmarks",
"pezkuwi-pez-node-primitives/runtime-benchmarks",
"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
"pezkuwi-node-subsystem-types/runtime-benchmarks",
"pezkuwi-node-subsystem/runtime-benchmarks",
+1 -1
View File
@@ -16,7 +16,7 @@
use super::*;
use pezkuwi_node_primitives::{BabeAllowedSlots, BabeEpoch, BabeEpochConfiguration};
use pezkuwi_pez_node_primitives::{BabeAllowedSlots, BabeEpoch, BabeEpochConfiguration};
use pezkuwi_node_subsystem::SpawnGlue;
use pezkuwi_node_subsystem_test_helpers::make_subsystem_context;
use pezkuwi_primitives::{