Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

[bump] orchestra v0.0.4 #6413

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion node/overseer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ polkadot-node-primitives = { path = "../primitives" }
polkadot-node-subsystem-types = { path = "../subsystem-types" }
polkadot-node-metrics = { path = "../metrics" }
polkadot-primitives = { path = "../../primitives" }
orchestra = "0.0.2"
orchestra = "0.0.3"
gum = { package = "tracing-gum", path = "../gum" }
lru = "0.8"
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
Expand All @@ -34,3 +34,4 @@ test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../pri
[features]
default = []
expand = ["orchestra/expand"]
dotgraph = ["orchestra/dotgraph"]
3 changes: 3 additions & 0 deletions node/overseer/src/dummy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ use crate::{
use lru::LruCache;
use orchestra::{FromOrchestra, SpawnedSubsystem, Subsystem, SubsystemContext};
use polkadot_node_subsystem_types::{errors::SubsystemError, messages::*};
// Generated dummy messages
use crate::messages::*;

/// A dummy subsystem that implements [`Subsystem`] for all
/// types of messages. Used for tests or as a placeholder.
#[derive(Clone, Copy, Debug)]
Expand Down
15 changes: 8 additions & 7 deletions node/overseer/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,16 @@ use lru::LruCache;
use client::{BlockImportNotification, BlockchainEvents, FinalityNotification};
use polkadot_primitives::v2::{Block, BlockNumber, Hash};

use self::messages::{BitfieldSigningMessage, PvfCheckerMessage};
use polkadot_node_subsystem_types::messages::{
ApprovalDistributionMessage, ApprovalVotingMessage, AvailabilityDistributionMessage,
AvailabilityRecoveryMessage, AvailabilityStoreMessage, BitfieldDistributionMessage,
BitfieldSigningMessage, CandidateBackingMessage, CandidateValidationMessage, ChainApiMessage,
ChainSelectionMessage, CollationGenerationMessage, CollatorProtocolMessage,
DisputeCoordinatorMessage, DisputeDistributionMessage, GossipSupportMessage,
NetworkBridgeRxMessage, NetworkBridgeTxMessage, ProvisionerMessage, PvfCheckerMessage,
RuntimeApiMessage, StatementDistributionMessage,
CandidateBackingMessage, CandidateValidationMessage, ChainApiMessage, ChainSelectionMessage,
CollationGenerationMessage, CollatorProtocolMessage, DisputeCoordinatorMessage,
DisputeDistributionMessage, GossipSupportMessage, NetworkBridgeRxMessage,
NetworkBridgeTxMessage, ProvisionerMessage, RuntimeApiMessage, StatementDistributionMessage,
};

pub use polkadot_node_subsystem_types::{
errors::{SubsystemError, SubsystemResult},
jaeger, ActivatedLeaf, ActiveLeavesUpdate, LeafStatus, OverseerSignal,
Expand Down Expand Up @@ -458,7 +459,7 @@ pub struct Overseer<SupportsParachains> {
])]
candidate_validation: CandidateValidation,

#[subsystem(PvfCheckerMessage, sends: [
#[subsystem(sends: [
CandidateValidationMessage,
RuntimeApiMessage,
])]
Expand Down Expand Up @@ -498,7 +499,7 @@ pub struct Overseer<SupportsParachains> {
])]
availability_recovery: AvailabilityRecovery,

#[subsystem(blocking, BitfieldSigningMessage, sends: [
#[subsystem(blocking, sends: [
AvailabilityStoreMessage,
RuntimeApiMessage,
BitfieldDistributionMessage,
Expand Down
2 changes: 1 addition & 1 deletion node/subsystem-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ polkadot-node-primitives = { path = "../primitives" }
polkadot-node-network-protocol = { path = "../network/protocol" }
polkadot-statement-table = { path = "../../statement-table" }
polkadot-node-jaeger = { path = "../jaeger" }
orchestra = "0.0.2"
orchestra = "0.0.3"
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
Expand Down
18 changes: 0 additions & 18 deletions node/subsystem-types/src/messages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -473,18 +473,6 @@ impl BitfieldDistributionMessage {
}
}

/// Bitfield signing message.
///
/// Currently non-instantiable.
#[derive(Debug)]
pub enum BitfieldSigningMessage {}

impl BoundToRelayParent for BitfieldSigningMessage {
fn relay_parent(&self) -> Hash {
match *self {}
}
}

/// Availability store subsystem message.
#[derive(Debug)]
pub enum AvailabilityStoreMessage {
Expand Down Expand Up @@ -950,9 +938,3 @@ pub enum GossipSupportMessage {
#[from]
NetworkBridgeUpdate(NetworkBridgeEvent<net_protocol::GossipSupportNetworkMessage>),
}

/// PVF checker message.
///
/// Currently non-instantiable.
#[derive(Debug)]
pub enum PvfCheckerMessage {}
3 changes: 3 additions & 0 deletions node/subsystem/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ pub use polkadot_node_subsystem_types::{
/// Re-export of all messages type, including the wrapper type.
pub mod messages {
pub use super::overseer::AllMessages;
// generated, empty message types
pub use super::overseer::messages::*;
// deliberately defined messages
pub use polkadot_node_subsystem_types::messages::*;
}

Expand Down