From fd51ecbe70a97054389d0db39ae7bdf0b58cb3e9 Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Tue, 24 May 2022 11:06:47 +0200
Subject: [PATCH] prepare orchestra crate publishing (#5579)
---
polkadot/Cargo.lock | 46 +++++++++----------
polkadot/node/metered-channel/Cargo.toml | 7 +--
polkadot/node/metrics/Cargo.toml | 2 +-
polkadot/node/metrics/src/lib.rs | 2 +-
polkadot/node/overseer/Cargo.toml | 2 +-
polkadot/node/overseer/orchestra/Cargo.toml | 7 +--
.../overseer/orchestra/proc-macro/Cargo.toml | 3 +-
polkadot/node/overseer/src/tests.rs | 2 +-
polkadot/node/subsystem-util/Cargo.toml | 2 +-
polkadot/node/subsystem-util/src/lib.rs | 2 +-
10 files changed, 39 insertions(+), 36 deletions(-)
diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index c0fd790cdff..1d14bfd6180 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -4324,23 +4324,6 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "metered-channel"
-version = "0.9.22"
-dependencies = [
- "assert_matches",
- "coarsetime",
- "crossbeam-queue",
- "derive_more",
- "env_logger 0.9.0",
- "futures 0.3.21",
- "futures-timer",
- "log",
- "nanorand",
- "thiserror",
- "tracing",
-]
-
[[package]]
name = "mick-jaeger"
version = "0.1.8"
@@ -4827,15 +4810,15 @@ dependencies = [
[[package]]
name = "orchestra"
-version = "0.9.22"
+version = "0.0.1"
dependencies = [
"async-trait",
"dyn-clonable",
"futures 0.3.21",
"futures-timer",
- "metered-channel",
"orchestra-proc-macro",
"pin-project 1.0.10",
+ "prioritized-metered-channel",
"rustversion",
"thiserror",
"tracing",
@@ -4844,7 +4827,7 @@ dependencies = [
[[package]]
name = "orchestra-proc-macro"
-version = "0.9.22"
+version = "0.0.1"
dependencies = [
"assert_matches",
"expander 0.0.6",
@@ -6825,11 +6808,11 @@ dependencies = [
"futures-timer",
"hyper",
"log",
- "metered-channel",
"nix 0.24.1",
"parity-scale-codec",
"polkadot-primitives",
"polkadot-test-service",
+ "prioritized-metered-channel",
"prometheus-parse",
"sc-cli",
"sc-client-api",
@@ -6947,7 +6930,6 @@ dependencies = [
"lazy_static",
"log",
"lru 0.7.5",
- "metered-channel",
"parity-db",
"parity-scale-codec",
"parity-util-mem",
@@ -6962,6 +6944,7 @@ dependencies = [
"polkadot-overseer",
"polkadot-primitives",
"polkadot-primitives-test-helpers",
+ "prioritized-metered-channel",
"rand 0.8.5",
"sp-application-crypto",
"sp-core",
@@ -6980,7 +6963,6 @@ dependencies = [
"futures 0.3.21",
"futures-timer",
"lru 0.7.5",
- "metered-channel",
"orchestra",
"parity-util-mem",
"parking_lot 0.12.0",
@@ -6990,6 +6972,7 @@ dependencies = [
"polkadot-node-subsystem-types",
"polkadot-primitives",
"polkadot-primitives-test-helpers",
+ "prioritized-metered-channel",
"sc-client-api",
"sp-api",
"sp-core",
@@ -7764,6 +7747,23 @@ dependencies = [
"uint",
]
+[[package]]
+name = "prioritized-metered-channel"
+version = "0.1.1"
+dependencies = [
+ "assert_matches",
+ "coarsetime",
+ "crossbeam-queue",
+ "derive_more",
+ "env_logger 0.9.0",
+ "futures 0.3.21",
+ "futures-timer",
+ "log",
+ "nanorand",
+ "thiserror",
+ "tracing",
+]
+
[[package]]
name = "proc-macro-crate"
version = "1.1.3"
diff --git a/polkadot/node/metered-channel/Cargo.toml b/polkadot/node/metered-channel/Cargo.toml
index a7d6b7ee384..97b9d971cda 100644
--- a/polkadot/node/metered-channel/Cargo.toml
+++ b/polkadot/node/metered-channel/Cargo.toml
@@ -1,9 +1,10 @@
[package]
-name = "metered-channel"
-version = "0.9.22"
+name = "prioritized-metered-channel"
+version = "0.1.1"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
-description = "Channels with attached Meters"
+description = "Channels with built-in observability and message priorizitazion (coming soonâ„¢)"
+repository = "https://github.com/paritytech/polkadot.git"
license = "MIT OR Apache-2.0"
[dependencies]
diff --git a/polkadot/node/metrics/Cargo.toml b/polkadot/node/metrics/Cargo.toml
index f657084a25b..67d3e90d4ad 100644
--- a/polkadot/node/metrics/Cargo.toml
+++ b/polkadot/node/metrics/Cargo.toml
@@ -10,7 +10,7 @@ futures = "0.3.21"
futures-timer = "3.0.2"
gum = { package = "tracing-gum", path = "../gum" }
-metered-channel = { path = "../metered-channel" }
+metered = { package = "prioritized-metered-channel", path = "../metered-channel" }
# Both `sc-service` and `sc-cli` are required by runtime metrics `logger_hook()`.
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/polkadot/node/metrics/src/lib.rs b/polkadot/node/metrics/src/lib.rs
index 0390788dde1..3c00272981c 100644
--- a/polkadot/node/metrics/src/lib.rs
+++ b/polkadot/node/metrics/src/lib.rs
@@ -24,7 +24,7 @@
#![deny(missing_docs)]
#![deny(unused_imports)]
-pub use metered_channel as metered;
+pub use metered;
/// Cyclic metric collection support.
pub mod metronome;
diff --git a/polkadot/node/overseer/Cargo.toml b/polkadot/node/overseer/Cargo.toml
index 7f51f8a3772..23f92a7a2fa 100644
--- a/polkadot/node/overseer/Cargo.toml
+++ b/polkadot/node/overseer/Cargo.toml
@@ -22,7 +22,7 @@ parity-util-mem = { version = "0.11.0", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
[dev-dependencies]
-metered-channel = { path = "../metered-channel" }
+metered = { package = "prioritized-metered-channel", path = "../metered-channel" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
futures = { version = "0.3.21", features = ["thread-pool"] }
femme = "2.2.1"
diff --git a/polkadot/node/overseer/orchestra/Cargo.toml b/polkadot/node/overseer/orchestra/Cargo.toml
index 4af9be0c365..7f9e9567326 100644
--- a/polkadot/node/overseer/orchestra/Cargo.toml
+++ b/polkadot/node/overseer/orchestra/Cargo.toml
@@ -1,9 +1,10 @@
[package]
name = "orchestra"
-version = "0.9.22"
+version = "0.0.1"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
description = "Generate an orchestra of subsystems from a single struct."
+repository = "https://github.com/paritytech/polkadot"
license = "MIT OR Apache-2.0"
autoexamples = false
@@ -12,8 +13,8 @@ tracing = "0.1.34"
futures = "0.3"
async-trait = "0.1"
thiserror = "1"
-metered = { package = "metered-channel", path = "../../metered-channel" }
-orchestra-proc-macro = { path = "./proc-macro" }
+metered = { package = "prioritized-metered-channel", version = "0.1.1", path = "../../metered-channel" }
+orchestra-proc-macro = { version = "0.0.1", path = "./proc-macro" }
futures-timer = "3.0.2"
pin-project = "1.0"
dyn-clonable = "0.9"
diff --git a/polkadot/node/overseer/orchestra/proc-macro/Cargo.toml b/polkadot/node/overseer/orchestra/proc-macro/Cargo.toml
index fa5c44549e7..d5314ca18b2 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/Cargo.toml
+++ b/polkadot/node/overseer/orchestra/proc-macro/Cargo.toml
@@ -1,9 +1,10 @@
[package]
name = "orchestra-proc-macro"
-version = "0.9.22"
+version = "0.0.1"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
description = "Generate an orchestra of subsystems from a single annotated struct definition."
+repository = "https://github.com/paritytech/polkadot"
license = "MIT OR Apache-2.0"
[package.metadata.docs.rs]
diff --git a/polkadot/node/overseer/src/tests.rs b/polkadot/node/overseer/src/tests.rs
index 2a7a430bcea..beff15e347c 100644
--- a/polkadot/node/overseer/src/tests.rs
+++ b/polkadot/node/overseer/src/tests.rs
@@ -39,7 +39,7 @@ use crate::{
gen::Delay,
HeadSupportsParachains,
};
-use metered_channel as metered;
+use metered;
use assert_matches::assert_matches;
use sp_core::crypto::Pair as _;
diff --git a/polkadot/node/subsystem-util/Cargo.toml b/polkadot/node/subsystem-util/Cargo.toml
index 34d78940faf..4aec7be170a 100644
--- a/polkadot/node/subsystem-util/Cargo.toml
+++ b/polkadot/node/subsystem-util/Cargo.toml
@@ -26,7 +26,7 @@ polkadot-node-network-protocol = { path = "../network/protocol" }
polkadot-primitives = { path = "../../primitives" }
polkadot-node-primitives = { path = "../primitives" }
polkadot-overseer = { path = "../overseer" }
-metered-channel = { path = "../metered-channel" }
+metered = { package = "prioritized-metered-channel", path = "../metered-channel" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/polkadot/node/subsystem-util/src/lib.rs b/polkadot/node/subsystem-util/src/lib.rs
index 5fba22bc139..2ca11b44593 100644
--- a/polkadot/node/subsystem-util/src/lib.rs
+++ b/polkadot/node/subsystem-util/src/lib.rs
@@ -68,7 +68,7 @@ use std::{
};
use thiserror::Error;
-pub use metered_channel as metered;
+pub use metered;
pub use polkadot_node_network_protocol::MIN_GOSSIP_PEERS;
pub use determine_new_blocks::determine_new_blocks;
--
GitLab