chore: regenerate umbrella crate, fix feature propagation
This commit is contained in:
@@ -33,18 +33,6 @@ use pezkuwi_node_network_protocol::{
|
||||
peer_set::MAX_NOTIFICATION_SIZE,
|
||||
v3 as protocol_v3, PeerId, UnifiedReputationChange as Rep, ValidationProtocols, View,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
approval::{
|
||||
criteria::{AssignmentCriteria, InvalidAssignment},
|
||||
time::{Clock, ClockExt, SystemClock, TICK_TOO_FAR_IN_FUTURE},
|
||||
v1::{BlockApprovalMeta, DelayTranche, RelayVRFStory},
|
||||
v2::{
|
||||
AsBitIndex, AssignmentCertKindV2, CandidateBitfield, IndirectAssignmentCertV2,
|
||||
IndirectSignedApprovalVoteV2,
|
||||
},
|
||||
},
|
||||
DISPUTE_WINDOW,
|
||||
};
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{
|
||||
ApprovalDistributionMessage, ApprovalVotingMessage, CheckedIndirectAssignment,
|
||||
@@ -57,6 +45,18 @@ use pezkuwi_node_subsystem_util::{
|
||||
reputation::{ReputationAggregator, REPUTATION_CHANGE_INTERVAL},
|
||||
runtime::{Config as RuntimeInfoConfig, ExtendedSessionInfo, RuntimeInfo},
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
approval::{
|
||||
criteria::{AssignmentCriteria, InvalidAssignment},
|
||||
time::{Clock, ClockExt, SystemClock, TICK_TOO_FAR_IN_FUTURE},
|
||||
v1::{BlockApprovalMeta, DelayTranche, RelayVRFStory},
|
||||
v2::{
|
||||
AsBitIndex, AssignmentCertKindV2, CandidateBitfield, IndirectAssignmentCertV2,
|
||||
IndirectSignedApprovalVoteV2,
|
||||
},
|
||||
},
|
||||
DISPUTE_WINDOW,
|
||||
};
|
||||
use pezkuwi_primitives::{
|
||||
BlockNumber, CandidateHash, CandidateIndex, CoreIndex, DisputeStatement, GroupIndex, Hash,
|
||||
SessionIndex, Slot, ValidDisputeStatementKind, ValidatorIndex, ValidatorSignature,
|
||||
|
||||
@@ -23,6 +23,10 @@ use pezkuwi_node_network_protocol::{
|
||||
peer_set::ValidationVersion,
|
||||
view, ObservedRole,
|
||||
};
|
||||
use pezkuwi_node_subsystem::messages::{
|
||||
network_bridge_event, AllMessages, ReportPeerMessage, RuntimeApiRequest,
|
||||
};
|
||||
use pezkuwi_node_subsystem_util::{reputation::add_reputation, TimeoutExt as _};
|
||||
use pezkuwi_pez_node_primitives::approval::{
|
||||
criteria,
|
||||
v1::{VrfPreOutput, VrfProof, VrfSignature},
|
||||
@@ -31,20 +35,16 @@ use pezkuwi_pez_node_primitives::approval::{
|
||||
RELAY_VRF_MODULO_CONTEXT,
|
||||
},
|
||||
};
|
||||
use pezkuwi_node_subsystem::messages::{
|
||||
network_bridge_event, AllMessages, ReportPeerMessage, RuntimeApiRequest,
|
||||
};
|
||||
use pezkuwi_node_subsystem_util::{reputation::add_reputation, TimeoutExt as _};
|
||||
use pezkuwi_primitives::{
|
||||
ApprovalVoteMultipleCandidates, AuthorityDiscoveryId, BlakeTwo256, CoreIndex, ExecutorParams,
|
||||
HashT, NodeFeatures, SessionInfo, ValidatorId,
|
||||
};
|
||||
use pezkuwi_primitives_test_helpers::dummy_signature;
|
||||
use rand::SeedableRng;
|
||||
use pezsc_keystore::{Keystore, LocalKeystore};
|
||||
use pezsp_application_crypto::AppCrypto;
|
||||
use pezsp_authority_discovery::AuthorityPair as AuthorityDiscoveryPair;
|
||||
use pezsp_core::crypto::Pair as PairT;
|
||||
use rand::SeedableRng;
|
||||
use std::time::Duration;
|
||||
type VirtualOverseer =
|
||||
pezkuwi_node_subsystem_test_helpers::TestSubsystemContextHandle<ApprovalDistributionMessage>;
|
||||
@@ -456,8 +456,10 @@ fn signature_for(
|
||||
}
|
||||
|
||||
struct MockAssignmentCriteria {
|
||||
tranche:
|
||||
Result<pezkuwi_pez_node_primitives::approval::v1::DelayTranche, criteria::InvalidAssignment>,
|
||||
tranche: Result<
|
||||
pezkuwi_pez_node_primitives::approval::v1::DelayTranche,
|
||||
criteria::InvalidAssignment,
|
||||
>,
|
||||
}
|
||||
|
||||
impl AssignmentCriteria for MockAssignmentCriteria {
|
||||
@@ -484,7 +486,8 @@ impl AssignmentCriteria for MockAssignmentCriteria {
|
||||
_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.tranche
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,12 +23,12 @@ use pezkuwi_node_network_protocol::request_response::{
|
||||
v1::{PoVFetchingRequest, PoVFetchingResponse},
|
||||
OutgoingRequest, Recipient,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::PoV;
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{IfDisconnected, NetworkBridgeTxMessage},
|
||||
overseer,
|
||||
};
|
||||
use pezkuwi_node_subsystem_util::runtime::RuntimeInfo;
|
||||
use pezkuwi_pez_node_primitives::PoV;
|
||||
use pezkuwi_primitives::{AuthorityDiscoveryId, CandidateHash, Hash, Id as ParaId, ValidatorIndex};
|
||||
|
||||
use crate::{
|
||||
@@ -128,11 +128,11 @@ mod tests {
|
||||
use pezsc_network::ProtocolName;
|
||||
use pezsp_core::testing::TaskExecutor;
|
||||
|
||||
use pezkuwi_pez_node_primitives::BlockData;
|
||||
use pezkuwi_node_subsystem::messages::{
|
||||
AllMessages, AvailabilityDistributionMessage, RuntimeApiMessage, RuntimeApiRequest,
|
||||
};
|
||||
use pezkuwi_node_subsystem_test_helpers as test_helpers;
|
||||
use pezkuwi_pez_node_primitives::BlockData;
|
||||
use pezkuwi_primitives::{CandidateHash, ExecutorParams, Hash, NodeFeatures, ValidatorIndex};
|
||||
use test_helpers::mock::make_ferdie_keystore;
|
||||
|
||||
|
||||
@@ -29,11 +29,11 @@ use pezkuwi_node_network_protocol::request_response::{
|
||||
v1::{self, ChunkResponse},
|
||||
v2,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::ErasureChunk;
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{AvailabilityStoreMessage, IfDisconnected, NetworkBridgeTxMessage},
|
||||
overseer,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::ErasureChunk;
|
||||
use pezkuwi_primitives::{
|
||||
AuthorityDiscoveryId, BlakeTwo256, CandidateHash, ChunkIndex, GroupIndex, Hash, HashT,
|
||||
OccupiedCore, SessionIndex,
|
||||
|
||||
@@ -33,8 +33,8 @@ use pezkuwi_node_network_protocol::request_response::{
|
||||
v1::{self, ChunkResponse},
|
||||
Protocol, Recipient, ReqProtocolNames,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{BlockData, PoV, Proof};
|
||||
use pezkuwi_node_subsystem::messages::AllMessages;
|
||||
use pezkuwi_pez_node_primitives::{BlockData, PoV, Proof};
|
||||
use pezkuwi_primitives::{CandidateHash, ChunkIndex, ValidatorIndex};
|
||||
|
||||
use super::*;
|
||||
|
||||
@@ -18,8 +18,8 @@ use futures::FutureExt;
|
||||
use std::future::Future;
|
||||
|
||||
use pezkuwi_node_network_protocol::request_response::ReqProtocolNames;
|
||||
use pezkuwi_pez_node_primitives::{BlockData, ErasureChunk, PoV};
|
||||
use pezkuwi_node_subsystem_util::runtime::RuntimeInfo;
|
||||
use pezkuwi_pez_node_primitives::{BlockData, ErasureChunk, PoV};
|
||||
use pezkuwi_primitives::{
|
||||
BlockNumber, ChunkIndex, CoreState, ExecutorParams, GroupIndex, Hash, Id as ParaId,
|
||||
ScheduledCore, SessionIndex, SessionInfo,
|
||||
|
||||
@@ -26,8 +26,8 @@ use pezkuwi_node_network_protocol::{
|
||||
request_response::{v1, v2, IncomingRequest, IncomingRequestReceiver, IsRequest},
|
||||
UnifiedReputationChange as Rep,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{AvailableData, ErasureChunk};
|
||||
use pezkuwi_node_subsystem::{messages::AvailabilityStoreMessage, SubsystemSender};
|
||||
use pezkuwi_pez_node_primitives::{AvailableData, ErasureChunk};
|
||||
use pezkuwi_primitives::{CandidateHash, ValidatorIndex};
|
||||
|
||||
use crate::{
|
||||
|
||||
@@ -37,7 +37,6 @@ use pezsp_keystore::KeystorePtr;
|
||||
use pezkuwi_node_network_protocol::request_response::{
|
||||
v1, v2, IncomingRequest, OutgoingRequest, Protocol, ReqProtocolNames, Requests,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::ErasureChunk;
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{
|
||||
AllMessages, AvailabilityDistributionMessage, AvailabilityStoreMessage, ChainApiMessage,
|
||||
@@ -46,6 +45,7 @@ use pezkuwi_node_subsystem::{
|
||||
ActiveLeavesUpdate, FromOrchestra, OverseerSignal,
|
||||
};
|
||||
use pezkuwi_node_subsystem_test_helpers as test_helpers;
|
||||
use pezkuwi_pez_node_primitives::ErasureChunk;
|
||||
use pezkuwi_primitives::{
|
||||
CandidateHash, ChunkIndex, CoreIndex, CoreState, ExecutorParams, GroupIndex, Hash,
|
||||
Id as ParaId, NodeFeatures, ScheduledCore, SessionInfo, ValidatorIndex,
|
||||
|
||||
@@ -54,7 +54,6 @@ use pezkuwi_node_network_protocol::{
|
||||
},
|
||||
UnifiedReputationChange as Rep,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::AvailableData;
|
||||
use pezkuwi_node_subsystem::{
|
||||
errors::RecoveryError,
|
||||
messages::{AvailabilityRecoveryMessage, AvailabilityStoreMessage},
|
||||
@@ -65,6 +64,7 @@ use pezkuwi_node_subsystem_util::{
|
||||
availability_chunks::availability_chunk_indices,
|
||||
runtime::{ExtendedSessionInfo, RuntimeInfo},
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::AvailableData;
|
||||
use pezkuwi_primitives::{
|
||||
node_features, BlockNumber, CandidateHash, CandidateReceiptV2 as CandidateReceipt, ChunkIndex,
|
||||
CoreIndex, GroupIndex, Hash, SessionIndex, ValidatorIndex,
|
||||
|
||||
@@ -31,8 +31,8 @@ pub use self::strategy::{REGULAR_CHUNKS_REQ_RETRY_LIMIT, SYSTEMATIC_CHUNKS_REQ_R
|
||||
use crate::{metrics::Metrics, ErasureTask, PostRecoveryCheck, LOG_TARGET};
|
||||
|
||||
use codec::Encode;
|
||||
use pezkuwi_pez_node_primitives::AvailableData;
|
||||
use pezkuwi_node_subsystem::{messages::AvailabilityStoreMessage, overseer, RecoveryError};
|
||||
use pezkuwi_pez_node_primitives::AvailableData;
|
||||
use pezkuwi_primitives::{AuthorityDiscoveryId, CandidateHash, Hash};
|
||||
use pezsc_network::ProtocolName;
|
||||
|
||||
|
||||
@@ -26,8 +26,8 @@ use crate::{
|
||||
ErasureTask, RecoveryStrategy, LOG_TARGET,
|
||||
};
|
||||
|
||||
use pezkuwi_pez_node_primitives::AvailableData;
|
||||
use pezkuwi_node_subsystem::{overseer, RecoveryError};
|
||||
use pezkuwi_pez_node_primitives::AvailableData;
|
||||
use pezkuwi_primitives::ValidatorIndex;
|
||||
|
||||
use futures::{channel::oneshot, SinkExt};
|
||||
|
||||
@@ -22,8 +22,8 @@ use crate::{
|
||||
use pezkuwi_node_network_protocol::request_response::{
|
||||
self as req_res, outgoing::RequestError, OutgoingRequest, Recipient, Requests,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::AvailableData;
|
||||
use pezkuwi_node_subsystem::{messages::NetworkBridgeTxMessage, overseer, RecoveryError};
|
||||
use pezkuwi_pez_node_primitives::AvailableData;
|
||||
use pezkuwi_primitives::ValidatorIndex;
|
||||
use pezsc_network::{IfDisconnected, OutboundFailure, RequestFailure};
|
||||
|
||||
|
||||
@@ -37,11 +37,11 @@ use pezkuwi_node_network_protocol::request_response::CHUNK_REQUEST_TIMEOUT;
|
||||
use pezkuwi_node_network_protocol::request_response::{
|
||||
self as req_res, outgoing::RequestError, OutgoingRequest, Recipient, Requests,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{AvailableData, ErasureChunk};
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{AvailabilityStoreMessage, NetworkBridgeTxMessage},
|
||||
overseer, RecoveryError,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{AvailableData, ErasureChunk};
|
||||
use pezkuwi_primitives::{AuthorityDiscoveryId, BlakeTwo256, ChunkIndex, HashT, ValidatorIndex};
|
||||
use pezsc_network::{IfDisconnected, OutboundFailure, ProtocolName, RequestFailure};
|
||||
use std::{
|
||||
@@ -645,11 +645,11 @@ mod tests {
|
||||
};
|
||||
use pezkuwi_erasure_coding::{recovery_threshold, systematic_recovery_threshold};
|
||||
use pezkuwi_node_network_protocol::request_response::Protocol;
|
||||
use pezkuwi_pez_node_primitives::{BlockData, PoV};
|
||||
use pezkuwi_node_subsystem::{AllMessages, TimeoutExt};
|
||||
use pezkuwi_node_subsystem_test_helpers::{
|
||||
derive_erasure_chunks_with_proofs_and_root, sender_receiver, TestSubsystemSender,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{BlockData, PoV};
|
||||
use pezkuwi_primitives::{CandidateHash, HeadData, PersistedValidationData};
|
||||
use pezkuwi_primitives_test_helpers::dummy_hash;
|
||||
use pezsp_keyring::Sr25519Keyring;
|
||||
|
||||
@@ -26,8 +26,8 @@ use crate::{
|
||||
LOG_TARGET,
|
||||
};
|
||||
|
||||
use pezkuwi_pez_node_primitives::AvailableData;
|
||||
use pezkuwi_node_subsystem::{overseer, RecoveryError};
|
||||
use pezkuwi_pez_node_primitives::AvailableData;
|
||||
use pezkuwi_primitives::{ChunkIndex, ValidatorIndex};
|
||||
|
||||
use std::collections::VecDeque;
|
||||
|
||||
@@ -31,7 +31,6 @@ use pezkuwi_node_network_protocol::request_response::{
|
||||
IncomingRequest, Protocol, Recipient, ReqProtocolNames, Requests,
|
||||
};
|
||||
|
||||
use pezkuwi_pez_node_primitives::{BlockData, ErasureChunk, PoV, Proof};
|
||||
use pezkuwi_node_subsystem::messages::{
|
||||
AllMessages, NetworkBridgeTxMessage, RuntimeApiMessage, RuntimeApiRequest,
|
||||
};
|
||||
@@ -40,6 +39,7 @@ use pezkuwi_node_subsystem_test_helpers::{
|
||||
TestSubsystemContextHandle,
|
||||
};
|
||||
use pezkuwi_node_subsystem_util::TimeoutExt;
|
||||
use pezkuwi_pez_node_primitives::{BlockData, ErasureChunk, PoV, Proof};
|
||||
use pezkuwi_primitives::{
|
||||
node_features, AuthorityDiscoveryId, Block, ExecutorParams, Hash, HeadData, IndexedVec,
|
||||
MutateDescriptorV2, NodeFeatures, PersistedValidationData, SessionInfo, ValidatorId,
|
||||
|
||||
@@ -29,12 +29,12 @@ use pezkuwi_node_subsystem::messages::ReportPeerMessage;
|
||||
use pezkuwi_node_subsystem_test_helpers::make_subsystem_context;
|
||||
use pezkuwi_node_subsystem_util::TimeoutExt;
|
||||
use pezkuwi_primitives::{AvailabilityBitfield, Signed, ValidatorIndex};
|
||||
use rand_chacha::ChaCha12Rng;
|
||||
use pezsp_application_crypto::AppCrypto;
|
||||
use pezsp_authority_discovery::AuthorityPair as AuthorityDiscoveryPair;
|
||||
use pezsp_core::Pair as PairT;
|
||||
use pezsp_keyring::Sr25519Keyring;
|
||||
use pezsp_keystore::{testing::MemoryKeystore, Keystore, KeystorePtr};
|
||||
use rand_chacha::ChaCha12Rng;
|
||||
|
||||
use std::{sync::Arc, time::Duration};
|
||||
|
||||
|
||||
@@ -15,9 +15,9 @@
|
||||
// along with Pezkuwi. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
use pezkuwi_node_network_protocol::request_response::incoming;
|
||||
use pezkuwi_pez_node_primitives::UncheckedSignedFullStatement;
|
||||
use pezkuwi_node_subsystem::{errors::SubsystemError, RuntimeApiError};
|
||||
use pezkuwi_node_subsystem_util::{backing_implicit_view, runtime};
|
||||
use pezkuwi_pez_node_primitives::UncheckedSignedFullStatement;
|
||||
|
||||
use crate::LOG_TARGET;
|
||||
|
||||
|
||||
@@ -24,8 +24,8 @@ use futures::{
|
||||
channel::oneshot, future::Fuse, pin_mut, select, stream::FuturesUnordered, FutureExt, StreamExt,
|
||||
};
|
||||
use metrics::{CollationStats, CollationTracker};
|
||||
use schnellru::{ByLength, LruMap};
|
||||
use pezsp_core::Pair;
|
||||
use schnellru::{ByLength, LruMap};
|
||||
|
||||
use pezkuwi_node_network_protocol::{
|
||||
self as net_protocol,
|
||||
@@ -37,7 +37,6 @@ use pezkuwi_node_network_protocol::{
|
||||
v1 as protocol_v1, v2 as protocol_v2, CollationProtocols, OurView, PeerId,
|
||||
UnifiedReputationChange as Rep, View,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{CollationSecondedSignal, PoV, Statement};
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{
|
||||
ChainApiMessage, CollatorProtocolMessage, NetworkBridgeEvent, NetworkBridgeTxMessage,
|
||||
@@ -53,6 +52,7 @@ use pezkuwi_node_subsystem_util::{
|
||||
},
|
||||
TimeoutExt,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{CollationSecondedSignal, PoV, Statement};
|
||||
use pezkuwi_primitives::{
|
||||
AuthorityDiscoveryId, BlockNumber, CandidateEvent, CandidateHash,
|
||||
CandidateReceiptV2 as CandidateReceipt, CollatorPair, CoreIndex, Hash, HeadData, Id as ParaId,
|
||||
|
||||
@@ -41,13 +41,13 @@ use pezkuwi_node_network_protocol::{
|
||||
},
|
||||
view, ObservedRole,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::BlockData;
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{AllMessages, ReportPeerMessage, RuntimeApiMessage, RuntimeApiRequest},
|
||||
ActivatedLeaf, ActiveLeavesUpdate,
|
||||
};
|
||||
use pezkuwi_node_subsystem_test_helpers as test_helpers;
|
||||
use pezkuwi_node_subsystem_util::{reputation::add_reputation, TimeoutExt};
|
||||
use pezkuwi_pez_node_primitives::BlockData;
|
||||
use pezkuwi_primitives::{
|
||||
AuthorityDiscoveryId, Block, CollatorPair, ExecutorParams, GroupIndex, GroupRotationInfo,
|
||||
IndexedVec, NodeFeatures, SessionIndex, SessionInfo, ValidatorId, ValidatorIndex,
|
||||
|
||||
@@ -47,8 +47,8 @@ use pezkuwi_node_network_protocol::{
|
||||
request_response::{outgoing::RequestError, v1 as request_v1, OutgoingResult},
|
||||
PeerId,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::PoV;
|
||||
use pezkuwi_node_subsystem_util::metrics::prometheus::prometheus::HistogramTimer;
|
||||
use pezkuwi_pez_node_primitives::PoV;
|
||||
use pezkuwi_primitives::{
|
||||
CandidateHash, CandidateReceiptV2 as CandidateReceipt, CollatorId, Hash, HeadData,
|
||||
Id as ParaId, PersistedValidationData,
|
||||
|
||||
@@ -37,7 +37,6 @@ use pezkuwi_node_network_protocol::{
|
||||
v1 as protocol_v1, v2 as protocol_v2, CollationProtocols, OurView, PeerId,
|
||||
UnifiedReputationChange as Rep, View,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{SignedFullStatement, Statement};
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{
|
||||
CanSecondRequest, CandidateBackingMessage, CollatorProtocolMessage, IfDisconnected,
|
||||
@@ -51,6 +50,7 @@ use pezkuwi_node_subsystem_util::{
|
||||
reputation::{ReputationAggregator, REPUTATION_CHANGE_INTERVAL},
|
||||
request_claim_queue, request_node_features, request_session_index_for_child,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{SignedFullStatement, Statement};
|
||||
use pezkuwi_primitives::{
|
||||
node_features, CandidateDescriptorV2, CandidateDescriptorVersion, CandidateHash, CollatorId,
|
||||
CoreIndex, Hash, HeadData, Id as ParaId, OccupiedCoreAssumption, PersistedValidationData,
|
||||
@@ -874,9 +874,9 @@ async fn process_incoming_peer_message<Context>(
|
||||
protocol_v2::CollatorProtocolMessage,
|
||||
>,
|
||||
) {
|
||||
use pezsp_runtime::traits::AppVerify;
|
||||
use protocol_v1::CollatorProtocolMessage as V1;
|
||||
use protocol_v2::CollatorProtocolMessage as V2;
|
||||
use pezsp_runtime::traits::AppVerify;
|
||||
|
||||
match msg {
|
||||
CollationProtocols::V1(V1::Declare(collator_id, para_id, signature)) |
|
||||
|
||||
@@ -34,12 +34,12 @@ use pezkuwi_node_network_protocol::{
|
||||
request_response::{Requests, ResponseSender},
|
||||
ObservedRole,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{BlockData, PoV};
|
||||
use pezkuwi_node_subsystem::messages::{
|
||||
AllMessages, ReportPeerMessage, RuntimeApiMessage, RuntimeApiRequest,
|
||||
};
|
||||
use pezkuwi_node_subsystem_test_helpers as test_helpers;
|
||||
use pezkuwi_node_subsystem_util::{reputation::add_reputation, TimeoutExt};
|
||||
use pezkuwi_pez_node_primitives::{BlockData, PoV};
|
||||
use pezkuwi_primitives::{
|
||||
node_features, CandidateReceiptV2 as CandidateReceipt, CollatorPair, CoreIndex,
|
||||
GroupRotationInfo, HeadData, NodeFeatures, PersistedValidationData, ValidatorId,
|
||||
|
||||
@@ -33,12 +33,12 @@ use pezkuwi_node_subsystem_util::nesting_sender::NestingSender;
|
||||
use pezsp_keystore::KeystorePtr;
|
||||
|
||||
use pezkuwi_node_network_protocol::request_response::{incoming::IncomingRequestReceiver, v1};
|
||||
use pezkuwi_pez_node_primitives::DISPUTE_WINDOW;
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::DisputeDistributionMessage, overseer, FromOrchestra, OverseerSignal,
|
||||
SpawnedSubsystem, SubsystemError,
|
||||
};
|
||||
use pezkuwi_node_subsystem_util::{runtime, runtime::RuntimeInfo};
|
||||
use pezkuwi_pez_node_primitives::DISPUTE_WINDOW;
|
||||
|
||||
/// ## The sender [`DisputeSender`]
|
||||
///
|
||||
|
||||
@@ -38,12 +38,12 @@ use pezkuwi_node_network_protocol::{
|
||||
},
|
||||
PeerId, UnifiedReputationChange as Rep,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::DISPUTE_WINDOW;
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{DisputeCoordinatorMessage, ImportStatementsResult},
|
||||
overseer,
|
||||
};
|
||||
use pezkuwi_node_subsystem_util::{runtime, runtime::RuntimeInfo};
|
||||
use pezkuwi_pez_node_primitives::DISPUTE_WINDOW;
|
||||
|
||||
use crate::{
|
||||
metrics::{FAILED, SUCCEEDED},
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
|
||||
//! Error handling related code and Error/Result definitions.
|
||||
|
||||
use pezkuwi_pez_node_primitives::disputes::DisputeMessageCheckError;
|
||||
use pezkuwi_node_subsystem::SubsystemError;
|
||||
use pezkuwi_node_subsystem_util::runtime;
|
||||
use pezkuwi_pez_node_primitives::disputes::DisputeMessageCheckError;
|
||||
|
||||
#[allow(missing_docs)]
|
||||
#[fatality::fatality(splitable)]
|
||||
|
||||
@@ -26,11 +26,11 @@ use futures::{channel::oneshot, future::poll_fn, Future};
|
||||
use futures_timer::Delay;
|
||||
use indexmap::{map::Entry, IndexMap};
|
||||
use pezkuwi_node_network_protocol::request_response::v1::DisputeRequest;
|
||||
use pezkuwi_pez_node_primitives::{DisputeMessage, DisputeStatus};
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::DisputeCoordinatorMessage, overseer, ActiveLeavesUpdate, SubsystemSender,
|
||||
};
|
||||
use pezkuwi_node_subsystem_util::{nesting_sender::NestingSender, runtime::RuntimeInfo};
|
||||
use pezkuwi_pez_node_primitives::{DisputeMessage, DisputeStatus};
|
||||
use pezkuwi_primitives::{CandidateHash, Hash, SessionIndex};
|
||||
|
||||
/// For each ongoing dispute we have a `SendTask` which takes care of it.
|
||||
|
||||
@@ -44,7 +44,6 @@ use pezkuwi_node_network_protocol::{
|
||||
request_response::{v1::DisputeResponse, Recipient, Requests},
|
||||
IfDisconnected,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::DisputeStatus;
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{
|
||||
AllMessages, DisputeCoordinatorMessage, DisputeDistributionMessage, ImportStatementsResult,
|
||||
@@ -56,6 +55,7 @@ use pezkuwi_node_subsystem_test_helpers::{
|
||||
mock::{make_ferdie_keystore, new_leaf},
|
||||
subsystem_test_harness, TestSubsystemContextHandle,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::DisputeStatus;
|
||||
use pezkuwi_primitives::{
|
||||
AuthorityDiscoveryId, Block, CandidateHash, CandidateReceiptV2 as CandidateReceipt,
|
||||
ExecutorParams, Hash, NodeFeatures, SessionIndex, SessionInfo,
|
||||
@@ -591,8 +591,11 @@ async fn send_network_dispute_request(
|
||||
message: DisputeRequest,
|
||||
) -> oneshot::Receiver<pezsc_network::config::OutgoingResponse> {
|
||||
let (pending_response, rx_response) = oneshot::channel();
|
||||
let req =
|
||||
pezsc_network::config::IncomingRequest { peer, payload: message.encode(), pending_response };
|
||||
let req = pezsc_network::config::IncomingRequest {
|
||||
peer,
|
||||
payload: message.encode(),
|
||||
pending_response,
|
||||
};
|
||||
req_tx.send(req).await.unwrap();
|
||||
rx_response
|
||||
}
|
||||
|
||||
@@ -31,9 +31,6 @@ use pezkuwi_node_network_protocol::{
|
||||
v3::{self as protocol_v3, StatementFilter},
|
||||
IfDisconnected, PeerId, UnifiedReputationChange as Rep, ValidationProtocols, View,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
SignedFullStatementWithPVD, StatementWithPVD as FullStatementWithPVD,
|
||||
};
|
||||
use pezkuwi_node_subsystem::{
|
||||
messages::{
|
||||
network_bridge_event::NewGossipTopology, CandidateBackingMessage, HypotheticalCandidate,
|
||||
@@ -46,6 +43,9 @@ use pezkuwi_node_subsystem_util::{
|
||||
backing_implicit_view::View as ImplicitView, reputation::ReputationAggregator,
|
||||
request_min_backing_votes, request_node_features, runtime::ClaimQueueSnapshot,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{
|
||||
SignedFullStatementWithPVD, StatementWithPVD as FullStatementWithPVD,
|
||||
};
|
||||
use pezkuwi_primitives::{
|
||||
node_features::FeatureIndex, transpose_claim_queue, AuthorityDiscoveryId,
|
||||
CandidateDescriptorVersion, CandidateHash, CompactStatement, CoreIndex, GroupIndex,
|
||||
|
||||
@@ -24,7 +24,6 @@ use pezkuwi_node_network_protocol::{
|
||||
v3::{BackedCandidateAcknowledgement, BackedCandidateManifest},
|
||||
view, ObservedRole,
|
||||
};
|
||||
use pezkuwi_pez_node_primitives::{Statement, StatementWithPVD};
|
||||
use pezkuwi_node_subsystem::messages::{
|
||||
network_bridge_event::NewGossipTopology, AllMessages, ChainApiMessage, HypotheticalCandidate,
|
||||
HypotheticalMembership, NetworkBridgeEvent, ProspectiveTeyrchainsMessage, ReportPeerMessage,
|
||||
@@ -32,6 +31,7 @@ use pezkuwi_node_subsystem::messages::{
|
||||
};
|
||||
use pezkuwi_node_subsystem_test_helpers as test_helpers;
|
||||
use pezkuwi_node_subsystem_util::TimeoutExt;
|
||||
use pezkuwi_pez_node_primitives::{Statement, StatementWithPVD};
|
||||
use pezkuwi_primitives::{
|
||||
AssignmentPair, Block, BlockNumber, CommittedCandidateReceiptV2 as CommittedCandidateReceipt,
|
||||
GroupRotationInfo, HeadData, Header, IndexedVec, NodeFeatures, PersistedValidationData,
|
||||
|
||||
Reference in New Issue
Block a user