chore: regenerate umbrella crate, fix feature propagation
This commit is contained in:
@@ -28,10 +28,6 @@ use pezkuwi_node_metrics::metered::{
|
||||
UnboundedMeteredSender,
|
||||
};
|
||||
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
approval::time::{Clock, SystemClock},
|
||||
DISPUTE_WINDOW,
|
||||
};
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{ApprovalDistributionMessage, ApprovalVotingMessage, ApprovalVotingParallelMessage},
|
||||
overseer, FromOrchestra, SpawnedSubsystem, SubsystemError, SubsystemResult,
|
||||
@@ -42,6 +38,10 @@ use pezkuwi_node_subsystem_util::{
|
||||
runtime::{Config as RuntimeInfoConfig, RuntimeInfo},
|
||||
};
|
||||
use pezkuwi_overseer::{OverseerSignal, Priority, SubsystemSender, TimeoutExt};
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
approval::time::{Clock, SystemClock},
|
||||
DISPUTE_WINDOW,
|
||||
};
|
||||
use pezkuwi_primitives::{CandidateIndex, Hash, ValidatorIndex, ValidatorSignature};
|
||||
use rand::SeedableRng;
|
||||
|
||||
|
||||
@@ -32,6 +32,12 @@ 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_subsystem::{
|
||||
messages::{ApprovalDistributionMessage, ApprovalVotingMessage, ApprovalVotingParallelMessage},
|
||||
FromOrchestra,
|
||||
};
|
||||
use pezkuwi_node_subsystem_test_helpers::{mock::new_leaf, TestSubsystemContext};
|
||||
use pezkuwi_overseer::{ActiveLeavesUpdate, OverseerSignal, SpawnGlue, TimeoutExt};
|
||||
use pezkuwi_pez_node_primitives::approval::{
|
||||
time::SystemClock,
|
||||
v1::RELAY_VRF_MODULO_CONTEXT,
|
||||
@@ -40,12 +46,6 @@ use pezkuwi_pez_node_primitives::approval::{
|
||||
IndirectSignedApprovalVoteV2,
|
||||
},
|
||||
};
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{ApprovalDistributionMessage, ApprovalVotingMessage, ApprovalVotingParallelMessage},
|
||||
FromOrchestra,
|
||||
};
|
||||
use pezkuwi_node_subsystem_test_helpers::{mock::new_leaf, TestSubsystemContext};
|
||||
use pezkuwi_overseer::{ActiveLeavesUpdate, OverseerSignal, SpawnGlue, TimeoutExt};
|
||||
use pezkuwi_primitives::{CandidateHash, CoreIndex, Hash, ValidatorIndex};
|
||||
use pezsc_keystore::{Keystore, LocalKeystore};
|
||||
use pezsp_consensus::SyncOracle;
|
||||
|
||||
@@ -24,8 +24,8 @@ use crate::{
|
||||
backend::Backend,
|
||||
};
|
||||
|
||||
use pezkuwi_pez_node_primitives::approval::v1::AssignmentCertKind;
|
||||
use pezkuwi_node_subsystem_util::database::Database;
|
||||
use pezkuwi_pez_node_primitives::approval::v1::AssignmentCertKind;
|
||||
use pezsp_application_crypto::pezsp_core::H256;
|
||||
use std::{collections::HashSet, sync::Arc};
|
||||
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
//! Version 2 of the DB schema.
|
||||
|
||||
use codec::{Decode, Encode};
|
||||
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_pez_node_primitives::approval::{v1::DelayTranche, v2::AssignmentCertV2};
|
||||
use pezkuwi_primitives::{
|
||||
BlockNumber, CandidateHash, CandidateIndex, CandidateReceiptV2 as CandidateReceipt, CoreIndex,
|
||||
GroupIndex, Hash, SessionIndex, ValidatorIndex, ValidatorSignature,
|
||||
|
||||
@@ -24,8 +24,8 @@ use crate::{
|
||||
},
|
||||
backend::{Backend, V2ReadBackend},
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::approval::v1::AssignmentCertKind;
|
||||
use pezkuwi_node_subsystem_util::database::Database;
|
||||
use pezkuwi_pez_node_primitives::approval::v1::AssignmentCertKind;
|
||||
use pezsp_application_crypto::pezsp_core::H256;
|
||||
use std::{collections::HashSet, sync::Arc};
|
||||
|
||||
|
||||
@@ -20,10 +20,10 @@
|
||||
//! and adds a new field `pending_signatures` for `BlockEntry`
|
||||
|
||||
use codec::{Decode, Encode};
|
||||
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;
|
||||
use pezkuwi_pez_node_primitives::approval::v2::CandidateBitfield;
|
||||
use pezkuwi_primitives::{
|
||||
BlockNumber, CandidateHash, CandidateIndex, CandidateReceiptV2 as CandidateReceipt, CoreIndex,
|
||||
GroupIndex, Hash, SessionIndex, ValidatorIndex, ValidatorSignature,
|
||||
|
||||
@@ -32,10 +32,10 @@ use pezkuwi_pez_node_primitives::approval::{
|
||||
use pezkuwi_primitives::{
|
||||
AssignmentPair, CandidateHash, CoreIndex, GroupIndex, IndexedVec, ValidatorIndex,
|
||||
};
|
||||
use rand::{seq::SliceRandom, SeedableRng};
|
||||
use rand_chacha::ChaCha20Rng;
|
||||
use pezsc_keystore::LocalKeystore;
|
||||
use pezsp_application_crypto::ByteArray;
|
||||
use rand::{seq::SliceRandom, SeedableRng};
|
||||
use rand_chacha::ChaCha20Rng;
|
||||
|
||||
use merlin::Transcript;
|
||||
use schnorrkel::vrf::VRFInOut;
|
||||
@@ -262,7 +262,8 @@ pub fn compute_assignments(
|
||||
Ok(Some(pair)) => Some((ValidatorIndex(i as _), pair)),
|
||||
Ok(None) => None,
|
||||
Err(pezsc_keystore::Error::Unavailable) => None,
|
||||
Err(pezsc_keystore::Error::Io(e)) if e.kind() == std::io::ErrorKind::NotFound => None,
|
||||
Err(pezsc_keystore::Error::Io(e)) if e.kind() == std::io::ErrorKind::NotFound =>
|
||||
None,
|
||||
Err(e) => {
|
||||
gum::warn!(target: LOG_TARGET, "Encountered keystore error: {:?}", e);
|
||||
None
|
||||
|
||||
@@ -28,13 +28,6 @@
|
||||
//!
|
||||
//! We maintain a rolling window of session indices. This starts as empty
|
||||
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
approval::{
|
||||
self as approval_types,
|
||||
v1::{BlockApprovalMeta, RelayVRFStory},
|
||||
},
|
||||
MAX_FINALITY_LAG,
|
||||
};
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{
|
||||
ApprovalDistributionMessage, ChainApiMessage, ChainSelectionMessage, RuntimeApiMessage,
|
||||
@@ -44,6 +37,13 @@ use pezkuwi_node_subsystem::{
|
||||
};
|
||||
use pezkuwi_node_subsystem_util::{determine_new_blocks, runtime::RuntimeInfo};
|
||||
use pezkuwi_overseer::SubsystemSender;
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
approval::{
|
||||
self as approval_types,
|
||||
v1::{BlockApprovalMeta, RelayVRFStory},
|
||||
},
|
||||
MAX_FINALITY_LAG,
|
||||
};
|
||||
use pezkuwi_primitives::{
|
||||
node_features, BlockNumber, CandidateEvent, CandidateHash,
|
||||
CandidateReceiptV2 as CandidateReceipt, ConsensusLog, CoreIndex, GroupIndex, Hash, Header,
|
||||
@@ -612,22 +612,21 @@ pub(crate) mod tests {
|
||||
};
|
||||
use approval_types::time::Clock;
|
||||
use assert_matches::assert_matches;
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
approval::v1::{VrfSignature, VrfTranscript},
|
||||
DISPUTE_WINDOW,
|
||||
};
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{AllMessages, ApprovalVotingMessage},
|
||||
SubsystemContext,
|
||||
};
|
||||
use pezkuwi_node_subsystem_test_helpers::make_subsystem_context;
|
||||
use pezkuwi_node_subsystem_util::database::Database;
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
approval::v1::{VrfSignature, VrfTranscript},
|
||||
DISPUTE_WINDOW,
|
||||
};
|
||||
use pezkuwi_primitives::{
|
||||
node_features::FeatureIndex, ExecutorParams, Id as ParaId, IndexedVec, MutateDescriptorV2,
|
||||
NodeFeatures, SessionInfo, ValidatorId, ValidatorIndex,
|
||||
};
|
||||
use pezkuwi_primitives_test_helpers::{dummy_candidate_receipt_v2, dummy_hash};
|
||||
use schnellru::{ByLength, LruMap};
|
||||
pub(crate) use pezsp_consensus_babe::{
|
||||
digests::{CompatibleDigestItem, PreDigest, SecondaryVRFPreDigest},
|
||||
AllowedSlots, BabeEpochConfiguration, Epoch as BabeEpoch,
|
||||
@@ -635,6 +634,7 @@ pub(crate) mod tests {
|
||||
use pezsp_core::{crypto::VrfSecret, testing::TaskExecutor};
|
||||
use pezsp_keyring::sr25519::Keyring as Sr25519Keyring;
|
||||
pub(crate) use pezsp_runtime::{Digest, DigestItem};
|
||||
use schnellru::{ByLength, LruMap};
|
||||
use std::{pin::Pin, sync::Arc};
|
||||
|
||||
use crate::{approval_db::common::Config as DatabaseConfig, criteria, BlockEntry};
|
||||
@@ -710,8 +710,10 @@ pub(crate) mod tests {
|
||||
_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_pez_node_primitives::approval::v1::DelayTranche, criteria::InvalidAssignment>
|
||||
{
|
||||
) -> Result<
|
||||
pezkuwi_pez_node_primitives::approval::v1::DelayTranche,
|
||||
criteria::InvalidAssignment,
|
||||
> {
|
||||
Ok(0)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,16 +22,6 @@
|
||||
//! been sufficiently approved to finalize.
|
||||
|
||||
use futures_timer::Delay;
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
approval::{
|
||||
v1::{BlockApprovalMeta, DelayTranche},
|
||||
v2::{
|
||||
AssignmentCertKindV2, BitfieldError, CandidateBitfield, CoreBitfield,
|
||||
IndirectAssignmentCertV2, IndirectSignedApprovalVoteV2,
|
||||
},
|
||||
},
|
||||
ValidationResult, DISPUTE_WINDOW,
|
||||
};
|
||||
use pezkuwi_node_subsystem::{
|
||||
errors::RecoveryError,
|
||||
messages::{
|
||||
@@ -52,6 +42,16 @@ use pezkuwi_node_subsystem_util::{
|
||||
runtime::{Config as RuntimeInfoConfig, ExtendedSessionInfo, RuntimeInfo},
|
||||
TimeoutExt,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
approval::{
|
||||
v1::{BlockApprovalMeta, DelayTranche},
|
||||
v2::{
|
||||
AssignmentCertKindV2, BitfieldError, CandidateBitfield, CoreBitfield,
|
||||
IndirectAssignmentCertV2, IndirectSignedApprovalVoteV2,
|
||||
},
|
||||
},
|
||||
ValidationResult, DISPUTE_WINDOW,
|
||||
};
|
||||
use pezkuwi_primitives::{
|
||||
ApprovalVoteMultipleCandidates, ApprovalVotingParams, BlockNumber, CandidateHash,
|
||||
CandidateIndex, CandidateReceiptV2 as CandidateReceipt, CoreIndex, ExecutorParams, GroupIndex,
|
||||
|
||||
@@ -22,6 +22,15 @@ use overseer::prometheus::{
|
||||
prometheus::{IntCounter, IntCounterVec},
|
||||
Histogram, HistogramOpts, HistogramVec, Opts,
|
||||
};
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{
|
||||
AllMessages, ApprovalVotingMessage, AssignmentCheckResult, AvailabilityRecoveryMessage,
|
||||
},
|
||||
ActiveLeavesUpdate, SubsystemContext,
|
||||
};
|
||||
use pezkuwi_node_subsystem_test_helpers as test_helpers;
|
||||
use pezkuwi_node_subsystem_util::TimeoutExt;
|
||||
use pezkuwi_overseer::SpawnGlue;
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
approval::{
|
||||
v1::{
|
||||
@@ -32,15 +41,6 @@ use pezkuwi_pez_node_primitives::{
|
||||
},
|
||||
AvailableData, BlockData, PoV,
|
||||
};
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{
|
||||
AllMessages, ApprovalVotingMessage, AssignmentCheckResult, AvailabilityRecoveryMessage,
|
||||
},
|
||||
ActiveLeavesUpdate, SubsystemContext,
|
||||
};
|
||||
use pezkuwi_node_subsystem_test_helpers as test_helpers;
|
||||
use pezkuwi_node_subsystem_util::TimeoutExt;
|
||||
use pezkuwi_overseer::SpawnGlue;
|
||||
use pezkuwi_primitives::{
|
||||
ApprovalVote, CandidateCommitments, CandidateEvent, CoreIndex, DisputeStatement, GroupIndex,
|
||||
Header, Id as ParaId, IndexedVec, MutateDescriptorV2, NodeFeatures, ValidDisputeStatementKind,
|
||||
@@ -259,7 +259,8 @@ where
|
||||
_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_pez_node_primitives::approval::v1::DelayTranche, criteria::InvalidAssignment> {
|
||||
) -> Result<pezkuwi_pez_node_primitives::approval::v1::DelayTranche, criteria::InvalidAssignment>
|
||||
{
|
||||
self.1(validator_index)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,13 +39,13 @@ use pezkuwi_node_subsystem_util::database::{DBTransaction, Database};
|
||||
use pezsp_consensus::SyncOracle;
|
||||
|
||||
use bitvec::{order::Lsb0 as BitOrderLsb0, vec::BitVec};
|
||||
use pezkuwi_pez_node_primitives::{AvailableData, ErasureChunk};
|
||||
use pezkuwi_node_subsystem::{
|
||||
errors::{ChainApiError, RuntimeApiError},
|
||||
messages::{AvailabilityStoreMessage, ChainApiMessage, StoreAvailableDataError},
|
||||
overseer, ActiveLeavesUpdate, FromOrchestra, OverseerSignal, SpawnedSubsystem, SubsystemError,
|
||||
};
|
||||
use pezkuwi_node_subsystem_util as util;
|
||||
use pezkuwi_pez_node_primitives::{AvailableData, ErasureChunk};
|
||||
use pezkuwi_primitives::{
|
||||
BlockNumber, CandidateEvent, CandidateHash, CandidateReceiptV2 as CandidateReceipt, ChunkIndex,
|
||||
CoreIndex, Hash, Header, NodeFeatures, ValidatorIndex,
|
||||
|
||||
@@ -22,7 +22,6 @@ use util::availability_chunks::availability_chunk_index;
|
||||
|
||||
use self::test_helpers::mock::new_leaf;
|
||||
use parking_lot::Mutex;
|
||||
use pezkuwi_pez_node_primitives::{AvailableData, BlockData, PoV, Proof};
|
||||
use pezkuwi_node_subsystem::{
|
||||
errors::RuntimeApiError,
|
||||
messages::{AllMessages, RuntimeApiMessage, RuntimeApiRequest},
|
||||
@@ -30,6 +29,7 @@ use pezkuwi_node_subsystem::{
|
||||
};
|
||||
use pezkuwi_node_subsystem_test_helpers as test_helpers;
|
||||
use pezkuwi_node_subsystem_util::{database::Database, TimeoutExt};
|
||||
use pezkuwi_pez_node_primitives::{AvailableData, BlockData, PoV, Proof};
|
||||
use pezkuwi_primitives::{
|
||||
node_features, CandidateHash, CandidateReceiptV2 as CandidateReceipt, CoreIndex, GroupIndex,
|
||||
HeadData, Header, PersistedValidationData, ValidatorId,
|
||||
|
||||
@@ -80,10 +80,6 @@ use futures::{
|
||||
use schnellru::{ByLength, LruMap};
|
||||
|
||||
use error::{Error, FatalResult};
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
AvailableData, InvalidCandidate, PoV, SignedFullStatementWithPVD, StatementWithPVD,
|
||||
ValidationResult,
|
||||
};
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{
|
||||
AvailabilityDistributionMessage, AvailabilityStoreMessage, CanSecondRequest,
|
||||
@@ -105,6 +101,10 @@ use pezkuwi_node_subsystem_util::{
|
||||
runtime::{self, ClaimQueueSnapshot},
|
||||
Validator,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
AvailableData, InvalidCandidate, PoV, SignedFullStatementWithPVD, StatementWithPVD,
|
||||
ValidationResult,
|
||||
};
|
||||
use pezkuwi_primitives::{
|
||||
BackedCandidate, CandidateCommitments, CandidateHash, CandidateReceiptV2 as CandidateReceipt,
|
||||
CommittedCandidateReceiptV2 as CommittedCandidateReceipt, CoreIndex, ExecutorParams,
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
use super::*;
|
||||
use assert_matches::assert_matches;
|
||||
use futures::{future, Future};
|
||||
use pezkuwi_pez_node_primitives::{BlockData, InvalidCandidate, SignedFullStatement, Statement};
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{
|
||||
AllMessages, ChainApiMessage, CollatorProtocolMessage, HypotheticalMembership, PvfExecKind,
|
||||
@@ -26,6 +25,7 @@ use pezkuwi_node_subsystem::{
|
||||
ActivatedLeaf, ActiveLeavesUpdate, FromOrchestra, OverseerSignal, TimeoutExt,
|
||||
};
|
||||
use pezkuwi_node_subsystem_test_helpers::mock::new_leaf;
|
||||
use pezkuwi_pez_node_primitives::{BlockData, InvalidCandidate, SignedFullStatement, Statement};
|
||||
use pezkuwi_primitives::{
|
||||
BlockNumber, CoreState, GroupRotationInfo, HeadData, Header, MutateDescriptorV2, OccupiedCore,
|
||||
PersistedValidationData, ScheduledCore, SessionIndex, LEGACY_MIN_BACKING_VOTES,
|
||||
|
||||
@@ -27,7 +27,6 @@ use pezkuwi_node_core_pvf::{
|
||||
InternalValidationError, InvalidCandidate as WasmInvalidCandidate, PossiblyInvalidError,
|
||||
PrepareError, PrepareJobKind, PvfPrepData, ValidationError, ValidationHost,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{InvalidCandidate, PoV, ValidationResult};
|
||||
use pezkuwi_node_subsystem::{
|
||||
errors::RuntimeApiError,
|
||||
messages::{
|
||||
@@ -42,6 +41,7 @@ use pezkuwi_node_subsystem_util::{
|
||||
runtime::{fetch_scheduling_lookahead, ClaimQueueSnapshot},
|
||||
};
|
||||
use pezkuwi_overseer::{ActivatedLeaf, ActiveLeavesUpdate};
|
||||
use pezkuwi_pez_node_primitives::{InvalidCandidate, PoV, ValidationResult};
|
||||
use pezkuwi_primitives::{
|
||||
executor_params::{
|
||||
DEFAULT_APPROVAL_EXECUTION_TIMEOUT, DEFAULT_BACKING_EXECUTION_TIMEOUT,
|
||||
|
||||
@@ -24,11 +24,11 @@ use crate::PvfExecKind;
|
||||
use assert_matches::assert_matches;
|
||||
use futures::executor;
|
||||
use pezkuwi_node_core_pvf::PrepareError;
|
||||
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;
|
||||
use pezkuwi_overseer::ActivatedLeaf;
|
||||
use pezkuwi_pez_node_primitives::BlockData;
|
||||
use pezkuwi_primitives::{
|
||||
CandidateDescriptorV2, CandidateDescriptorVersion, ClaimQueueOffset,
|
||||
CommittedCandidateReceiptError, CoreIndex, CoreSelector, GroupIndex, HeadData, Id as ParaId,
|
||||
@@ -39,10 +39,10 @@ use pezkuwi_primitives_test_helpers::{
|
||||
dummy_collator, dummy_collator_signature, dummy_hash, make_valid_candidate_descriptor,
|
||||
make_valid_candidate_descriptor_v2, CandidateDescriptor,
|
||||
};
|
||||
use rstest::rstest;
|
||||
use pezsp_core::{sr25519::Public, testing::TaskExecutor};
|
||||
use pezsp_keyring::Sr25519Keyring;
|
||||
use pezsp_keystore::{testing::MemoryKeystore, Keystore};
|
||||
use rstest::rstest;
|
||||
|
||||
const VALIDATION_CODE_BOMB_LIMIT: u32 = 30 * 1024 * 1024;
|
||||
|
||||
@@ -1341,10 +1341,12 @@ fn compressed_code_works() {
|
||||
let head_data = HeadData(vec![1, 1, 1]);
|
||||
|
||||
let raw_code = vec![2u8; 16];
|
||||
let validation_code =
|
||||
pezsp_maybe_compressed_blob::compress_strongly(&raw_code, VALIDATION_CODE_BOMB_LIMIT as usize)
|
||||
.map(ValidationCode)
|
||||
.unwrap();
|
||||
let validation_code = pezsp_maybe_compressed_blob::compress_strongly(
|
||||
&raw_code,
|
||||
VALIDATION_CODE_BOMB_LIMIT as usize,
|
||||
)
|
||||
.map(ValidationCode)
|
||||
.unwrap();
|
||||
|
||||
let descriptor = make_valid_candidate_descriptor(
|
||||
ParaId::from(1_u32),
|
||||
|
||||
@@ -20,9 +20,9 @@ use codec::Encode;
|
||||
use futures::{channel::oneshot, future::BoxFuture};
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
use pezkuwi_pez_node_primitives::BlockWeight;
|
||||
use pezkuwi_node_subsystem_test_helpers::{make_subsystem_context, TestSubsystemContextHandle};
|
||||
use pezkuwi_node_subsystem_types::ChainApiBackend;
|
||||
use pezkuwi_pez_node_primitives::BlockWeight;
|
||||
use pezkuwi_primitives::{Block, BlockNumber, Hash, Header};
|
||||
use pezsp_blockchain::Info as BlockInfo;
|
||||
use pezsp_core::testing::TaskExecutor;
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
|
||||
//! Implements the Chain Selection Subsystem.
|
||||
|
||||
use pezkuwi_pez_node_primitives::BlockWeight;
|
||||
use pezkuwi_node_subsystem::{
|
||||
errors::ChainApiError,
|
||||
messages::{ChainApiMessage, ChainSelectionMessage},
|
||||
@@ -24,6 +23,7 @@ use pezkuwi_node_subsystem::{
|
||||
FromOrchestra, OverseerSignal, SpawnedSubsystem, SubsystemError,
|
||||
};
|
||||
use pezkuwi_node_subsystem_util::database::Database;
|
||||
use pezkuwi_pez_node_primitives::BlockWeight;
|
||||
use pezkuwi_primitives::{BlockNumber, ConsensusLog, Hash, Header};
|
||||
|
||||
use codec::Error as CodecError;
|
||||
|
||||
@@ -23,8 +23,8 @@
|
||||
//! 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_pez_node_primitives::BlockWeight;
|
||||
use pezkuwi_node_subsystem::ChainApiError;
|
||||
use pezkuwi_pez_node_primitives::BlockWeight;
|
||||
use pezkuwi_primitives::{BlockNumber, Hash};
|
||||
|
||||
use std::collections::HashMap;
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
//! 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_pez_node_primitives::DisputeStatus;
|
||||
use pezkuwi_node_subsystem_util::database::{DBTransaction, Database};
|
||||
use pezkuwi_pez_node_primitives::DisputeStatus;
|
||||
use pezkuwi_primitives::{
|
||||
CandidateHash, CandidateReceiptV2 as CandidateReceipt, Hash, InvalidDisputeStatementKind,
|
||||
SessionIndex, ValidDisputeStatementKind, ValidatorIndex, ValidatorSignature,
|
||||
|
||||
@@ -28,11 +28,11 @@
|
||||
|
||||
use std::collections::{BTreeMap, HashMap, HashSet};
|
||||
|
||||
use pezkuwi_node_subsystem::overseer;
|
||||
use pezkuwi_node_subsystem_util::{runtime::RuntimeInfo, ControlledValidatorIndices};
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
disputes::ValidCandidateVotes, CandidateVotes, DisputeStatus, SignedDisputeStatement, Timestamp,
|
||||
};
|
||||
use pezkuwi_node_subsystem::overseer;
|
||||
use pezkuwi_node_subsystem_util::{runtime::RuntimeInfo, ControlledValidatorIndices};
|
||||
use pezkuwi_primitives::{
|
||||
CandidateHash, CandidateReceiptV2 as CandidateReceipt, DisputeStatement, ExecutorParams, Hash,
|
||||
IndexedVec, SessionIndex, SessionInfo, ValidDisputeStatementKind, ValidatorId, ValidatorIndex,
|
||||
|
||||
@@ -28,10 +28,6 @@ use futures::{
|
||||
|
||||
use pezsc_keystore::LocalKeystore;
|
||||
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
disputes::ValidCandidateVotes, CandidateVotes, DisputeStatus, SignedDisputeStatement,
|
||||
Timestamp, DISPUTE_WINDOW,
|
||||
};
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{
|
||||
ApprovalVotingParallelMessage, BlockDescription, ChainSelectionMessage,
|
||||
@@ -43,6 +39,10 @@ use pezkuwi_node_subsystem_util::{
|
||||
runtime::{self, key_ownership_proof, submit_report_dispute_lost, RuntimeInfo},
|
||||
ControlledValidatorIndices,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
disputes::ValidCandidateVotes, CandidateVotes, DisputeStatus, SignedDisputeStatement,
|
||||
Timestamp, DISPUTE_WINDOW,
|
||||
};
|
||||
use pezkuwi_primitives::{
|
||||
slashing, BlockNumber, CandidateHash, CandidateReceiptV2 as CandidateReceipt, CompactStatement,
|
||||
DisputeStatement, DisputeStatementSet, Hash, ScrapedOnChainVotes, SessionIndex,
|
||||
|
||||
@@ -33,10 +33,6 @@ use futures::FutureExt;
|
||||
use gum::CandidateHash;
|
||||
use pezsc_keystore::LocalKeystore;
|
||||
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
CandidateVotes, DisputeMessage, DisputeMessageCheckError, SignedDisputeStatement,
|
||||
DISPUTE_WINDOW,
|
||||
};
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::DisputeDistributionMessage, overseer, ActivatedLeaf, FromOrchestra, OverseerSignal,
|
||||
SpawnedSubsystem, SubsystemError,
|
||||
@@ -46,6 +42,10 @@ use pezkuwi_node_subsystem_util::{
|
||||
runtime::{Config as RuntimeInfoConfig, RuntimeInfo},
|
||||
ControlledValidatorIndices,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
CandidateVotes, DisputeMessage, DisputeMessageCheckError, SignedDisputeStatement,
|
||||
DISPUTE_WINDOW,
|
||||
};
|
||||
use pezkuwi_primitives::{
|
||||
DisputeStatement, ScrapedOnChainVotes, SessionIndex, SessionInfo, ValidatorIndex,
|
||||
};
|
||||
|
||||
@@ -25,12 +25,12 @@ use futures::{
|
||||
#[cfg(test)]
|
||||
use futures_timer::Delay;
|
||||
|
||||
use pezkuwi_pez_node_primitives::ValidationResult;
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{AvailabilityRecoveryMessage, CandidateValidationMessage, PvfExecKind},
|
||||
overseer, ActiveLeavesUpdate, RecoveryError,
|
||||
};
|
||||
use pezkuwi_node_subsystem_util::runtime::get_validation_code_by_hash;
|
||||
use pezkuwi_pez_node_primitives::ValidationResult;
|
||||
use pezkuwi_primitives::{
|
||||
BlockNumber, CandidateHash, CandidateReceiptV2 as CandidateReceipt, Hash, SessionIndex,
|
||||
};
|
||||
|
||||
@@ -23,7 +23,6 @@ use pezsp_core::testing::TaskExecutor;
|
||||
|
||||
use super::*;
|
||||
use codec::Encode;
|
||||
use pezkuwi_pez_node_primitives::{AvailableData, BlockData, InvalidCandidate, PoV};
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{
|
||||
AllMessages, ChainApiMessage, DisputeCoordinatorMessage, PvfExecKind, RuntimeApiMessage,
|
||||
@@ -34,6 +33,7 @@ use pezkuwi_node_subsystem::{
|
||||
use pezkuwi_node_subsystem_test_helpers::{
|
||||
make_subsystem_context, mock::new_leaf, TestSubsystemContext, TestSubsystemContextHandle,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{AvailableData, BlockData, InvalidCandidate, PoV};
|
||||
use pezkuwi_primitives::{
|
||||
BlakeTwo256, CandidateCommitments, HashT, Header, PersistedValidationData, ValidationCode,
|
||||
};
|
||||
|
||||
@@ -19,7 +19,6 @@ use std::collections::{btree_map::Entry, BTreeMap, HashSet};
|
||||
use futures::channel::oneshot;
|
||||
use schnellru::{ByLength, LruMap};
|
||||
|
||||
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,
|
||||
@@ -27,6 +26,9 @@ use pezkuwi_node_subsystem::{
|
||||
use pezkuwi_node_subsystem_util::runtime::{
|
||||
self, get_candidate_events, get_on_chain_votes, get_unapplied_slashes,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION, MAX_FINALITY_LAG,
|
||||
};
|
||||
use pezkuwi_primitives::{
|
||||
slashing::PendingSlashes, BlockNumber, CandidateEvent, CandidateHash,
|
||||
CandidateReceiptV2 as CandidateReceipt, Hash, ScrapedOnChainVotes, SessionIndex,
|
||||
|
||||
@@ -22,7 +22,6 @@ use codec::Encode;
|
||||
use futures::future::join;
|
||||
use pezsp_core::testing::TaskExecutor;
|
||||
|
||||
use pezkuwi_pez_node_primitives::DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION;
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{
|
||||
AllMessages, ChainApiMessage, DisputeCoordinatorMessage, RuntimeApiMessage,
|
||||
@@ -35,6 +34,7 @@ use pezkuwi_node_subsystem_test_helpers::{
|
||||
TestSubsystemSender,
|
||||
};
|
||||
use pezkuwi_node_subsystem_util::{reexports::SubsystemContext, TimeoutExt};
|
||||
use pezkuwi_pez_node_primitives::DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION;
|
||||
use pezkuwi_primitives::{
|
||||
BlakeTwo256, BlockNumber, CandidateEvent, CandidateReceiptV2 as CandidateReceipt, CoreIndex,
|
||||
GroupIndex, Hash, HashT, HeadData, Id as ParaId,
|
||||
|
||||
@@ -31,10 +31,6 @@ use futures::{
|
||||
|
||||
use pezkuwi_node_subsystem_util::database::Database;
|
||||
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
DisputeMessage, DisputeStatus, SignedDisputeStatement, SignedFullStatement, Statement,
|
||||
DISPUTE_WINDOW,
|
||||
};
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{
|
||||
ApprovalVotingParallelMessage, ChainApiMessage, ChainSelectionMessage,
|
||||
@@ -43,6 +39,10 @@ use pezkuwi_node_subsystem::{
|
||||
overseer::FromOrchestra,
|
||||
OverseerSignal,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
DisputeMessage, DisputeStatus, SignedDisputeStatement, SignedFullStatement, Statement,
|
||||
DISPUTE_WINDOW,
|
||||
};
|
||||
|
||||
use pezkuwi_node_subsystem_util::TimeoutExt;
|
||||
use pezsc_keystore::LocalKeystore;
|
||||
@@ -51,7 +51,6 @@ use pezsp_core::{sr25519::Pair, testing::TaskExecutor, Pair as PairT};
|
||||
use pezsp_keyring::Sr25519Keyring;
|
||||
use pezsp_keystore::{Keystore, KeystorePtr};
|
||||
|
||||
use pezkuwi_pez_node_primitives::{Timestamp, ACTIVE_DURATION_SECS};
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{AllMessages, BlockDescription, RuntimeApiMessage, RuntimeApiRequest},
|
||||
ActiveLeavesUpdate,
|
||||
@@ -59,6 +58,7 @@ use pezkuwi_node_subsystem::{
|
||||
use pezkuwi_node_subsystem_test_helpers::{
|
||||
make_buffered_subsystem_context, mock::new_leaf, TestSubsystemContextHandle,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{Timestamp, ACTIVE_DURATION_SECS};
|
||||
use pezkuwi_primitives::{
|
||||
ApprovalVote, BlockNumber, CandidateCommitments, CandidateEvent, CandidateHash,
|
||||
CandidateReceiptV2 as CandidateReceipt, CoreIndex, DisputeStatement, ExecutorParams,
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
use crate::LOG_TARGET;
|
||||
use futures::channel::oneshot;
|
||||
use pezkuwi_pez_node_primitives::CandidateVotes;
|
||||
use pezkuwi_node_subsystem::{messages::DisputeCoordinatorMessage, overseer};
|
||||
use pezkuwi_pez_node_primitives::CandidateVotes;
|
||||
use pezkuwi_primitives::{CandidateHash, SessionIndex};
|
||||
|
||||
/// Request the relevant dispute statements for a set of disputes identified by `CandidateHash` and
|
||||
|
||||
@@ -20,12 +20,12 @@
|
||||
|
||||
use crate::{error::GetOnchainDisputesError, metrics, LOG_TARGET};
|
||||
use futures::channel::oneshot;
|
||||
use pezkuwi_pez_node_primitives::{dispute_is_inactive, CandidateVotes, DisputeStatus, Timestamp};
|
||||
use pezkuwi_node_subsystem::{
|
||||
errors::RuntimeApiError,
|
||||
messages::{DisputeCoordinatorMessage, RuntimeApiMessage, RuntimeApiRequest},
|
||||
overseer, ActivatedLeaf,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{dispute_is_inactive, CandidateVotes, DisputeStatus, Timestamp};
|
||||
use pezkuwi_primitives::{
|
||||
supermajority_threshold, CandidateHash, DisputeState, DisputeStatement, DisputeStatementSet,
|
||||
Hash, MultiDisputeStatementSet, SessionIndex, ValidDisputeStatementKind, ValidatorIndex,
|
||||
|
||||
@@ -20,11 +20,11 @@ use super::super::{
|
||||
};
|
||||
use bitvec::prelude::*;
|
||||
use futures::channel::mpsc;
|
||||
use pezkuwi_pez_node_primitives::{CandidateVotes, DisputeStatus, ACTIVE_DURATION_SECS};
|
||||
use pezkuwi_node_subsystem::messages::{
|
||||
AllMessages, DisputeCoordinatorMessage, RuntimeApiMessage, RuntimeApiRequest,
|
||||
};
|
||||
use pezkuwi_node_subsystem_test_helpers::{mock::new_leaf, TestSubsystemSender};
|
||||
use pezkuwi_pez_node_primitives::{CandidateVotes, DisputeStatus, ACTIVE_DURATION_SECS};
|
||||
use pezkuwi_primitives::{
|
||||
CandidateHash, CandidateReceiptV2 as CandidateReceipt, DisputeState,
|
||||
InvalidDisputeStatementKind, SessionIndex, ValidDisputeStatementKind, ValidatorSignature,
|
||||
|
||||
@@ -271,7 +271,11 @@ impl pezsp_externalities::Externalities for ValidationExternalities {
|
||||
panic!("storage_root: unsupported feature for teyrchain validation")
|
||||
}
|
||||
|
||||
fn child_storage_root(&mut self, _: &ChildInfo, _: pezsp_core::storage::StateVersion) -> Vec<u8> {
|
||||
fn child_storage_root(
|
||||
&mut self,
|
||||
_: &ChildInfo,
|
||||
_: pezsp_core::storage::StateVersion,
|
||||
) -> Vec<u8> {
|
||||
panic!("child_storage_root: unsupported feature for teyrchain validation")
|
||||
}
|
||||
|
||||
|
||||
@@ -217,22 +217,24 @@ pub fn worker_entrypoint(
|
||||
|
||||
let compiled_artifact_blob = Arc::new(compiled_artifact_blob);
|
||||
|
||||
let raw_block_data =
|
||||
match pezsp_maybe_compressed_blob::decompress(&pov.block_data.0, POV_BOMB_LIMIT) {
|
||||
Ok(data) => data,
|
||||
Err(_) => {
|
||||
send_result::<WorkerResponse, WorkerError>(
|
||||
&mut stream,
|
||||
Ok(WorkerResponse {
|
||||
job_response: JobResponse::PoVDecompressionFailure,
|
||||
duration: Duration::ZERO,
|
||||
pov_size: 0,
|
||||
}),
|
||||
worker_info,
|
||||
)?;
|
||||
continue;
|
||||
},
|
||||
};
|
||||
let raw_block_data = match pezsp_maybe_compressed_blob::decompress(
|
||||
&pov.block_data.0,
|
||||
POV_BOMB_LIMIT,
|
||||
) {
|
||||
Ok(data) => data,
|
||||
Err(_) => {
|
||||
send_result::<WorkerResponse, WorkerError>(
|
||||
&mut stream,
|
||||
Ok(WorkerResponse {
|
||||
job_response: JobResponse::PoVDecompressionFailure,
|
||||
duration: Duration::ZERO,
|
||||
pov_size: 0,
|
||||
}),
|
||||
worker_info,
|
||||
)?;
|
||||
continue;
|
||||
},
|
||||
};
|
||||
|
||||
let pov_size = raw_block_data.len() as u32;
|
||||
|
||||
|
||||
@@ -34,8 +34,8 @@ use pezkuwi_node_core_pvf_common::{
|
||||
execute::{JobResponse, WorkerError, WorkerResponse},
|
||||
SecurityStatus,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::PoV;
|
||||
use pezkuwi_node_subsystem::{messages::PvfExecKind, ActiveLeavesUpdate};
|
||||
use pezkuwi_pez_node_primitives::PoV;
|
||||
use pezkuwi_primitives::{ExecutorParams, ExecutorParamsHash, Hash, PersistedValidationData};
|
||||
use slotmap::HopSlotMap;
|
||||
use std::{
|
||||
@@ -908,8 +908,8 @@ impl Unscheduled {
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use pezkuwi_pez_node_primitives::BlockData;
|
||||
use pezkuwi_node_subsystem_test_helpers::mock::new_leaf;
|
||||
use pezkuwi_pez_node_primitives::BlockData;
|
||||
use pezsp_core::H256;
|
||||
|
||||
use super::*;
|
||||
|
||||
@@ -38,10 +38,10 @@ use pezkuwi_node_core_pvf_common::{
|
||||
prepare::PrepareSuccess,
|
||||
pvf::PvfPrepData,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::PoV;
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::PvfExecKind, ActiveLeavesUpdate, SubsystemError, SubsystemResult,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::PoV;
|
||||
use pezkuwi_primitives::{Hash, PersistedValidationData};
|
||||
use pezkuwi_teyrchain_primitives::primitives::ValidationResult;
|
||||
use std::{
|
||||
|
||||
@@ -25,8 +25,8 @@ use pezkuwi_node_core_pvf::{
|
||||
ValidationHost, JOB_TIMEOUT_WALL_CLOCK_FACTOR,
|
||||
};
|
||||
use pezkuwi_node_core_pvf_common::{compute_checksum, ArtifactChecksum};
|
||||
use pezkuwi_pez_node_primitives::{PoV, POV_BOMB_LIMIT};
|
||||
use pezkuwi_node_subsystem::messages::PvfExecKind;
|
||||
use pezkuwi_pez_node_primitives::{PoV, POV_BOMB_LIMIT};
|
||||
use pezkuwi_primitives::{
|
||||
ExecutorParam, ExecutorParams, Hash, PersistedValidationData, PvfExecKind as RuntimePvfExecKind,
|
||||
};
|
||||
|
||||
@@ -28,9 +28,9 @@ use pezkuwi_primitives::PersistedValidationData;
|
||||
use pezkuwi_teyrchain_primitives::primitives::{
|
||||
BlockData as GenericBlockData, HeadData as GenericHeadData,
|
||||
};
|
||||
use pezsp_core::H256;
|
||||
use procfs::process;
|
||||
use rusty_fork::rusty_fork_test;
|
||||
use pezsp_core::H256;
|
||||
use std::{future::Future, sync::Arc, time::Duration};
|
||||
use test_teyrchain_adder::{hash_state, BlockData, HeadData};
|
||||
|
||||
|
||||
@@ -16,8 +16,8 @@
|
||||
|
||||
use std::collections::{btree_map::BTreeMap, VecDeque};
|
||||
|
||||
use schnellru::{ByLength, LruMap};
|
||||
use pezsp_consensus_babe::Epoch;
|
||||
use schnellru::{ByLength, LruMap};
|
||||
|
||||
use pezkuwi_primitives::{
|
||||
async_backing::{self, Constraints},
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
|
||||
use super::*;
|
||||
|
||||
use pezkuwi_pez_node_primitives::{BabeAllowedSlots, BabeEpoch, BabeEpochConfiguration};
|
||||
use pezkuwi_node_subsystem::SpawnGlue;
|
||||
use pezkuwi_node_subsystem_test_helpers::make_subsystem_context;
|
||||
use pezkuwi_pez_node_primitives::{BabeAllowedSlots, BabeEpoch, BabeEpochConfiguration};
|
||||
use pezkuwi_primitives::{
|
||||
async_backing, async_backing::Constraints, slashing, ApprovalVotingParams,
|
||||
AuthorityDiscoveryId, BlockNumber, CandidateCommitments, CandidateEvent, CandidateHash,
|
||||
|
||||
Reference in New Issue
Block a user