pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-06 19:37:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

split NetworkBridge into two subsystems (#5616)

Browse Source 
* foo

* rolling session window

* fixup

* remove use statemetn

* fmt

* split NetworkBridge into two subsystems

Pending cleanup

* split

* chore: reexport OrchestraError as OverseerError

* chore: silence warnings

* fixup tests

* chore: add default timenout of 30s to subsystem test helper ctx handle

* single item channel

* fixins

* fmt

* cleanup

* remove dead code

* remove sync bounds again

* wire up shared state

* deal with some FIXMEs

* use distinct tags

Co-authored-by: Andrei Sandu <54316454+sandreim@users.noreply.github.com>

* use tag

Co-authored-by: Andrei Sandu <54316454+sandreim@users.noreply.github.com>

* address naming

tx and rx are common in networking and also have an implicit meaning regarding networking
compared to incoming and outgoing which are already used with subsystems themselvesq

* remove unused sync oracle

* remove unneeded state

* fix tests

* chore: fmt

* do not try to register twice

* leak Metrics type

Co-authored-by: Andrei Sandu <54316454+sandreim@users.noreply.github.com>
Co-authored-by: Andronik <write@reusable.software>
This commit is contained in:
Bernhard Schuster
2022-07-12 18:22:36 +02:00
committed by GitHub
parent c11c1f38f4
commit 3240cb5e4d
40 changed files with 1880 additions and 1429 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/node/overseer/src/lib.rs
+20 -16
View File
@@ -83,8 +83,8 @@ use polkadot_node_subsystem_types::messages::{
BitfieldSigningMessage, CandidateBackingMessage, CandidateValidationMessage, ChainApiMessage,
ChainSelectionMessage, CollationGenerationMessage, CollatorProtocolMessage,
DisputeCoordinatorMessage, DisputeDistributionMessage, GossipSupportMessage,
NetworkBridgeMessage, ProvisionerMessage, PvfCheckerMessage, RuntimeApiMessage,
StatementDistributionMessage,
NetworkBridgeRxMessage, NetworkBridgeTxMessage, ProvisionerMessage, PvfCheckerMessage,
RuntimeApiMessage, StatementDistributionMessage,
};
pub use polkadot_node_subsystem_types::{
errors::{SubsystemError, SubsystemResult},
@@ -108,9 +108,9 @@ use parity_util_mem::MemoryAllocationTracker;
pub use orchestra as gen;
pub use orchestra::{
contextbounds, orchestra, subsystem, FromOrchestra, MapSubsystem, MessagePacket,
SignalsReceived, Spawner, Subsystem, SubsystemContext, SubsystemIncomingMessages,
SubsystemInstance, SubsystemMeterReadouts, SubsystemMeters, SubsystemSender, TimeoutExt,
ToOrchestra,
OrchestraError as OverseerError, SignalsReceived, Spawner, Subsystem, SubsystemContext,
SubsystemIncomingMessages, SubsystemInstance, SubsystemMeterReadouts, SubsystemMeters,
SubsystemSender, TimeoutExt, ToOrchestra,
};
/// Store 2 days worth of blocks, not accounting for forks,
@@ -389,7 +389,7 @@ pub async fn forward_events<P: BlockchainEvents<Block>>(client: Arc<P>, mut hand
/// # };
/// # use polkadot_node_subsystem_types::messages::{
/// # CandidateValidationMessage, CandidateBackingMessage,
/// # NetworkBridgeMessage,
/// # NetworkBridgeTxMessage,
/// # };
///
/// struct ValidationSubsystem;
@@ -477,7 +477,7 @@ pub struct Overseer<SupportsParachains> {
candidate_backing: CandidateBacking,
#[subsystem(StatementDistributionMessage, sends: [
NetworkBridgeMessage,
NetworkBridgeTxMessage,
CandidateBackingMessage,
RuntimeApiMessage,
])]
@@ -488,12 +488,12 @@ pub struct Overseer<SupportsParachains> {
AvailabilityRecoveryMessage,
ChainApiMessage,
RuntimeApiMessage,
NetworkBridgeMessage,
NetworkBridgeTxMessage,
])]
availability_distribution: AvailabilityDistribution,
#[subsystem(AvailabilityRecoveryMessage, sends: [
NetworkBridgeMessage,
NetworkBridgeTxMessage,
RuntimeApiMessage,
AvailabilityStoreMessage,
])]
@@ -508,7 +508,7 @@ pub struct Overseer<SupportsParachains> {
#[subsystem(BitfieldDistributionMessage, sends: [
RuntimeApiMessage,
NetworkBridgeMessage,
NetworkBridgeTxMessage,
ProvisionerMessage,
])]
bitfield_distribution: BitfieldDistribution,
@@ -530,7 +530,7 @@ pub struct Overseer<SupportsParachains> {
])]
availability_store: AvailabilityStore,
#[subsystem(NetworkBridgeMessage, sends: [
#[subsystem(NetworkBridgeRxMessage, sends: [
BitfieldDistributionMessage,
StatementDistributionMessage,
ApprovalDistributionMessage,
@@ -539,7 +539,10 @@ pub struct Overseer<SupportsParachains> {
CollationGenerationMessage,
CollatorProtocolMessage,
])]
network_bridge: NetworkBridge,
network_bridge_rx: NetworkBridgeRx,
#[subsystem(NetworkBridgeTxMessage, sends: [])]
network_bridge_tx: NetworkBridgeTx,
#[subsystem(blocking, ChainApiMessage, sends: [])]
chain_api: ChainApi,
@@ -551,14 +554,14 @@ pub struct Overseer<SupportsParachains> {
collation_generation: CollationGeneration,
#[subsystem(CollatorProtocolMessage, sends: [
NetworkBridgeMessage,
NetworkBridgeTxMessage,
RuntimeApiMessage,
CandidateBackingMessage,
])]
collator_protocol: CollatorProtocol,
#[subsystem(ApprovalDistributionMessage, sends: [
NetworkBridgeMessage,
NetworkBridgeTxMessage,
ApprovalVotingMessage,
])]
approval_distribution: ApprovalDistribution,
@@ -575,7 +578,8 @@ pub struct Overseer<SupportsParachains> {
approval_voting: ApprovalVoting,
#[subsystem(GossipSupportMessage, sends: [
NetworkBridgeMessage,
NetworkBridgeTxMessage,
NetworkBridgeRxMessage, // TODO <https://github.com/paritytech/polkadot/issues/5626>
RuntimeApiMessage,
ChainSelectionMessage,
])]
@@ -594,7 +598,7 @@ pub struct Overseer<SupportsParachains> {
#[subsystem(DisputeDistributionMessage, sends: [
RuntimeApiMessage,
DisputeCoordinatorMessage,
NetworkBridgeMessage,
NetworkBridgeTxMessage,
])]
dispute_distribution: DisputeDistribution,