From b9a55985bd07bfda43400b441e9efb12489d6353 Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Mon, 19 Dec 2022 09:51:57 +0100
Subject: [PATCH] [bump] orchestra v0.0.4 (#6413)
* update orchestra to v0.0.3
* fix locks
* update orchestra to v0.0.4
* update lock
---
polkadot/Cargo.lock | 16 ++++++++--------
polkadot/node/overseer/Cargo.toml | 3 ++-
polkadot/node/overseer/src/dummy.rs | 3 +++
polkadot/node/overseer/src/lib.rs | 15 ++++++++-------
polkadot/node/subsystem-types/Cargo.toml | 2 +-
polkadot/node/subsystem-types/src/messages.rs | 18 ------------------
polkadot/node/subsystem/src/lib.rs | 3 +++
7 files changed, 25 insertions(+), 35 deletions(-)
diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index 1ad3b99e76f..fc912dfccc0 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -4534,9 +4534,9 @@ dependencies = [
[[package]]
name = "orchestra"
-version = "0.0.2"
+version = "0.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aab54694ddaa8a9b703724c6ef04272b2d27bc32d2c855aae5cdd1857216b43"
+checksum = "17e7d5b6bb115db09390bed8842c94180893dd83df3dfce7354f2a2aa090a4ee"
dependencies = [
"async-trait",
"dyn-clonable",
@@ -4551,9 +4551,9 @@ dependencies = [
[[package]]
name = "orchestra-proc-macro"
-version = "0.0.2"
+version = "0.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a702b2f6bf592b3eb06c00d80d05afaf7a8eff6b41bb361e397d799acc21b45a"
+checksum = "c2af4dabb2286b0be0e9711d2d24e25f6217048b71210cffd3daddc3b5c84e1f"
dependencies = [
"expander 0.0.6",
"itertools",
@@ -7530,9 +7530,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.43"
+version = "1.0.47"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
dependencies = [
"unicode-ident",
]
@@ -10871,9 +10871,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.98"
+version = "1.0.105"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
dependencies = [
"proc-macro2",
"quote",
diff --git a/polkadot/node/overseer/Cargo.toml b/polkadot/node/overseer/Cargo.toml
index 092ba410a12..52310422eb4 100644
--- a/polkadot/node/overseer/Cargo.toml
+++ b/polkadot/node/overseer/Cargo.toml
@@ -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.4"
gum = { package = "tracing-gum", path = "../gum" }
lru = "0.8"
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -34,3 +34,4 @@ test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../pri
[features]
default = []
expand = ["orchestra/expand"]
+dotgraph = ["orchestra/dotgraph"]
diff --git a/polkadot/node/overseer/src/dummy.rs b/polkadot/node/overseer/src/dummy.rs
index 0706244356a..cf72774826e 100644
--- a/polkadot/node/overseer/src/dummy.rs
+++ b/polkadot/node/overseer/src/dummy.rs
@@ -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)]
diff --git a/polkadot/node/overseer/src/lib.rs b/polkadot/node/overseer/src/lib.rs
index 3497bc88c05..6253f8b3e26 100644
--- a/polkadot/node/overseer/src/lib.rs
+++ b/polkadot/node/overseer/src/lib.rs
@@ -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,
@@ -458,7 +459,7 @@ pub struct Overseer<SupportsParachains> {
])]
candidate_validation: CandidateValidation,
- #[subsystem(PvfCheckerMessage, sends: [
+ #[subsystem(sends: [
CandidateValidationMessage,
RuntimeApiMessage,
])]
@@ -498,7 +499,7 @@ pub struct Overseer<SupportsParachains> {
])]
availability_recovery: AvailabilityRecovery,
- #[subsystem(blocking, BitfieldSigningMessage, sends: [
+ #[subsystem(blocking, sends: [
AvailabilityStoreMessage,
RuntimeApiMessage,
BitfieldDistributionMessage,
diff --git a/polkadot/node/subsystem-types/Cargo.toml b/polkadot/node/subsystem-types/Cargo.toml
index 175623dc32d..22528503ccc 100644
--- a/polkadot/node/subsystem-types/Cargo.toml
+++ b/polkadot/node/subsystem-types/Cargo.toml
@@ -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.4"
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" }
diff --git a/polkadot/node/subsystem-types/src/messages.rs b/polkadot/node/subsystem-types/src/messages.rs
index 94562ae6bae..cb0834c5ba3 100644
--- a/polkadot/node/subsystem-types/src/messages.rs
+++ b/polkadot/node/subsystem-types/src/messages.rs
@@ -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 {
@@ -950,9 +938,3 @@ pub enum GossipSupportMessage {
#[from]
NetworkBridgeUpdate(NetworkBridgeEvent<net_protocol::GossipSupportNetworkMessage>),
}
-
-/// PVF checker message.
-///
-/// Currently non-instantiable.
-#[derive(Debug)]
-pub enum PvfCheckerMessage {}
diff --git a/polkadot/node/subsystem/src/lib.rs b/polkadot/node/subsystem/src/lib.rs
index ce5fef2c8b5..6d534f5fd5b 100644
--- a/polkadot/node/subsystem/src/lib.rs
+++ b/polkadot/node/subsystem/src/lib.rs
@@ -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::*;
}
--
GitLab