chore: regenerate umbrella crate, fix feature propagation
This commit is contained in:
@@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user