From 032d623e8cbec5822d571915e91065694f84877e Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Tue, 24 May 2022 13:10:03 +0200
Subject: [PATCH] orchestra license headers (#5588)
---
polkadot/Cargo.lock | 2 +-
polkadot/Cargo.toml | 4 +-
polkadot/node/metered-channel/Cargo.toml | 2 +-
polkadot/node/metrics/Cargo.toml | 2 +-
.../node/{overseer => }/orchestra/Cargo.toml | 2 +-
.../node/{overseer => }/orchestra/README.md | 9 +++++
.../{overseer => }/orchestra/adr/01-adr.md | 0
.../{overseer => }/orchestra/examples/duo.rs | 15 +++++++
.../{overseer => }/orchestra/examples/misc.rs | 15 +++++++
.../{overseer => }/orchestra/examples/solo.rs | 15 +++++++
.../orchestra/proc-macro/Cargo.toml | 0
.../orchestra/proc-macro/build.rs | 0
.../orchestra/proc-macro/src/impl_builder.rs | 29 +++++++-------
.../proc-macro/src/impl_channels_out.rs | 29 +++++++-------
.../proc-macro/src/impl_message_wrapper.rs | 27 +++++++------
.../proc-macro/src/impl_orchestra.rs | 29 +++++++-------
.../src/impl_subsystem_ctx_sender.rs | 29 +++++++-------
.../orchestra/proc-macro/src/lib.rs | 27 +++++++------
.../orchestra/proc-macro/src/orchestra.rs | 27 +++++++------
.../orchestra/proc-macro/src/parse/mod.rs | 38 ++++++++++++++++++
.../src/parse/parse_orchestra_attr.rs | 27 +++++++------
.../src/parse/parse_orchestra_struct.rs | 29 +++++++-------
.../src/parse/parse_subsystem_attr.rs | 27 +++++++------
.../orchestra/proc-macro/src/parse/tests.rs | 29 +++++++-------
.../orchestra/proc-macro/src/subsystem.rs | 27 +++++++------
.../orchestra/proc-macro/src/tests.rs | 29 +++++++-------
.../node/{overseer => }/orchestra/src/lib.rs | 29 +++++++-------
polkadot/node/orchestra/src/tests.rs | 38 ++++++++++++++++++
.../tests/ui/err-01-duplicate-consumer.rs | 0
.../tests/ui/err-01-duplicate-consumer.stderr | 0
.../orchestra/tests/ui/err-02-enum.rs | 0
.../orchestra/tests/ui/err-02-enum.stderr | 0
.../orchestra/tests/ui/err-03-subsys-twice.rs | 0
.../tests/ui/err-03-subsys-twice.stderr | 0
.../tests/ui/err-04-missing-error.rs | 0
.../tests/ui/err-04-missing-error.stderr | 0
.../tests/ui/err-05-missing-field.rs | 0
.../tests/ui/err-05-missing-field.stderr | 0
.../tests/ui/err-06-missing-subsystem.rs | 0
.../tests/ui/err-06-missing-subsystem.stderr | 0
.../tests/ui/err-07-missing-spawner.rs | 0
.../tests/ui/err-07-missing-spawner.stderr | 0
.../tests/ui/err-08-duplicate-subsystem.rs | 0
.../ui/err-08-duplicate-subsystem.stderr | 0
.../tests/ui/err-09-uninit_generic_baggage.rs | 0
.../ui/err-09-uninit_generic_baggage.stderr | 0
.../orchestra/tests/ui/ok-01-wip.rs | 0
polkadot/node/overseer/Cargo.toml | 2 +-
.../orchestra/proc-macro/src/parse/mod.rs | 39 -------------------
polkadot/node/overseer/orchestra/src/tests.rs | 39 -------------------
polkadot/node/subsystem-types/Cargo.toml | 2 +-
polkadot/node/subsystem-util/Cargo.toml | 2 +-
52 files changed, 329 insertions(+), 291 deletions(-)
rename polkadot/node/{overseer => }/orchestra/Cargo.toml (95%)
rename polkadot/node/{overseer => }/orchestra/README.md (95%)
rename polkadot/node/{overseer => }/orchestra/adr/01-adr.md (100%)
rename polkadot/node/{overseer => }/orchestra/examples/duo.rs (76%)
rename polkadot/node/{overseer => }/orchestra/examples/misc.rs (68%)
rename polkadot/node/{overseer => }/orchestra/examples/solo.rs (64%)
rename polkadot/node/{overseer => }/orchestra/proc-macro/Cargo.toml (100%)
rename polkadot/node/{overseer => }/orchestra/proc-macro/build.rs (100%)
rename polkadot/node/{overseer => }/orchestra/proc-macro/src/impl_builder.rs (97%)
rename polkadot/node/{overseer => }/orchestra/proc-macro/src/impl_channels_out.rs (83%)
rename polkadot/node/{overseer => }/orchestra/proc-macro/src/impl_message_wrapper.rs (69%)
rename polkadot/node/{overseer => }/orchestra/proc-macro/src/impl_orchestra.rs (91%)
rename polkadot/node/{overseer => }/orchestra/proc-macro/src/impl_subsystem_ctx_sender.rs (96%)
rename polkadot/node/{overseer => }/orchestra/proc-macro/src/lib.rs (73%)
rename polkadot/node/{overseer => }/orchestra/proc-macro/src/orchestra.rs (70%)
create mode 100644 polkadot/node/orchestra/proc-macro/src/parse/mod.rs
rename polkadot/node/{overseer => }/orchestra/proc-macro/src/parse/parse_orchestra_attr.rs (89%)
rename polkadot/node/{overseer => }/orchestra/proc-macro/src/parse/parse_orchestra_struct.rs (95%)
rename polkadot/node/{overseer => }/orchestra/proc-macro/src/parse/parse_subsystem_attr.rs (85%)
rename polkadot/node/{overseer => }/orchestra/proc-macro/src/parse/tests.rs (89%)
rename polkadot/node/{overseer => }/orchestra/proc-macro/src/subsystem.rs (92%)
rename polkadot/node/{overseer => }/orchestra/proc-macro/src/tests.rs (73%)
rename polkadot/node/{overseer => }/orchestra/src/lib.rs (96%)
create mode 100644 polkadot/node/orchestra/src/tests.rs
rename polkadot/node/{overseer => }/orchestra/tests/ui/err-01-duplicate-consumer.rs (100%)
rename polkadot/node/{overseer => }/orchestra/tests/ui/err-01-duplicate-consumer.stderr (100%)
rename polkadot/node/{overseer => }/orchestra/tests/ui/err-02-enum.rs (100%)
rename polkadot/node/{overseer => }/orchestra/tests/ui/err-02-enum.stderr (100%)
rename polkadot/node/{overseer => }/orchestra/tests/ui/err-03-subsys-twice.rs (100%)
rename polkadot/node/{overseer => }/orchestra/tests/ui/err-03-subsys-twice.stderr (100%)
rename polkadot/node/{overseer => }/orchestra/tests/ui/err-04-missing-error.rs (100%)
rename polkadot/node/{overseer => }/orchestra/tests/ui/err-04-missing-error.stderr (100%)
rename polkadot/node/{overseer => }/orchestra/tests/ui/err-05-missing-field.rs (100%)
rename polkadot/node/{overseer => }/orchestra/tests/ui/err-05-missing-field.stderr (100%)
rename polkadot/node/{overseer => }/orchestra/tests/ui/err-06-missing-subsystem.rs (100%)
rename polkadot/node/{overseer => }/orchestra/tests/ui/err-06-missing-subsystem.stderr (100%)
rename polkadot/node/{overseer => }/orchestra/tests/ui/err-07-missing-spawner.rs (100%)
rename polkadot/node/{overseer => }/orchestra/tests/ui/err-07-missing-spawner.stderr (100%)
rename polkadot/node/{overseer => }/orchestra/tests/ui/err-08-duplicate-subsystem.rs (100%)
rename polkadot/node/{overseer => }/orchestra/tests/ui/err-08-duplicate-subsystem.stderr (100%)
rename polkadot/node/{overseer => }/orchestra/tests/ui/err-09-uninit_generic_baggage.rs (100%)
rename polkadot/node/{overseer => }/orchestra/tests/ui/err-09-uninit_generic_baggage.stderr (100%)
rename polkadot/node/{overseer => }/orchestra/tests/ui/ok-01-wip.rs (100%)
delete mode 100644 polkadot/node/overseer/orchestra/proc-macro/src/parse/mod.rs
delete mode 100644 polkadot/node/overseer/orchestra/src/tests.rs
diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index 1d14bfd6180..eaf26f9de0a 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -7749,7 +7749,7 @@ dependencies = [
[[package]]
name = "prioritized-metered-channel"
-version = "0.1.1"
+version = "0.2.0"
dependencies = [
"assert_matches",
"coarsetime",
diff --git a/polkadot/Cargo.toml b/polkadot/Cargo.toml
index 70aa3f77c32..9b8aeed34fe 100644
--- a/polkadot/Cargo.toml
+++ b/polkadot/Cargo.toml
@@ -83,8 +83,8 @@ members = [
"node/network/gossip-support",
"node/network/dispute-distribution",
"node/overseer",
- "node/overseer/orchestra",
- "node/overseer/orchestra/proc-macro",
+ "node/orchestra",
+ "node/orchestra/proc-macro",
"node/malus",
"node/primitives",
"node/service",
diff --git a/polkadot/node/metered-channel/Cargo.toml b/polkadot/node/metered-channel/Cargo.toml
index 97b9d971cda..f306f07eeea 100644
--- a/polkadot/node/metered-channel/Cargo.toml
+++ b/polkadot/node/metered-channel/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "prioritized-metered-channel"
-version = "0.1.1"
+version = "0.2.0"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
description = "Channels with built-in observability and message priorizitazion (coming soonâ„¢)"
diff --git a/polkadot/node/metrics/Cargo.toml b/polkadot/node/metrics/Cargo.toml
index 67d3e90d4ad..b9621fd5c4b 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 = { package = "prioritized-metered-channel", path = "../metered-channel" }
+metered = { package = "prioritized-metered-channel", path = "../metered-channel" , "version" = "0.2.0" }
# 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/overseer/orchestra/Cargo.toml b/polkadot/node/orchestra/Cargo.toml
similarity index 95%
rename from polkadot/node/overseer/orchestra/Cargo.toml
rename to polkadot/node/orchestra/Cargo.toml
index 7f9e9567326..67b16a244ad 100644
--- a/polkadot/node/overseer/orchestra/Cargo.toml
+++ b/polkadot/node/orchestra/Cargo.toml
@@ -13,7 +13,7 @@ tracing = "0.1.34"
futures = "0.3"
async-trait = "0.1"
thiserror = "1"
-metered = { package = "prioritized-metered-channel", version = "0.1.1", path = "../../metered-channel" }
+metered = { package = "prioritized-metered-channel", version = "0.2.0", path = "../metered-channel" }
orchestra-proc-macro = { version = "0.0.1", path = "./proc-macro" }
futures-timer = "3.0.2"
pin-project = "1.0"
diff --git a/polkadot/node/overseer/orchestra/README.md b/polkadot/node/orchestra/README.md
similarity index 95%
rename from polkadot/node/overseer/orchestra/README.md
rename to polkadot/node/orchestra/README.md
index 46106d40f82..2cfe4bb0a88 100644
--- a/polkadot/node/overseer/orchestra/README.md
+++ b/polkadot/node/orchestra/README.md
@@ -88,3 +88,12 @@ As always, debugging is notoriously annoying with bugged proc-macros.
Therefore [`expander`](https://github.com/drahnr/expander) is employed to yield better
error messages. Enable with `--feature=orchestra/expand`.
+
+## License
+
+Licensed under either of
+
+* Apache License, Version 2.0, (LICENSE-APACHE or <http://www.apache.org/licenses/LICENSE-2.0>)
+* MIT license (LICENSE-MIT or <http://opensource.org/licenses/MIT>)
+
+at your option.
diff --git a/polkadot/node/overseer/orchestra/adr/01-adr.md b/polkadot/node/orchestra/adr/01-adr.md
similarity index 100%
rename from polkadot/node/overseer/orchestra/adr/01-adr.md
rename to polkadot/node/orchestra/adr/01-adr.md
diff --git a/polkadot/node/overseer/orchestra/examples/duo.rs b/polkadot/node/orchestra/examples/duo.rs
similarity index 76%
rename from polkadot/node/overseer/orchestra/examples/duo.rs
rename to polkadot/node/orchestra/examples/duo.rs
index 7e5cc32cd8a..0b9f269b3c2 100644
--- a/polkadot/node/overseer/orchestra/examples/duo.rs
+++ b/polkadot/node/orchestra/examples/duo.rs
@@ -1,3 +1,18 @@
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
#![allow(dead_code)] // orchestra events are not used
//! A dummy to be used with cargo expand
diff --git a/polkadot/node/overseer/orchestra/examples/misc.rs b/polkadot/node/orchestra/examples/misc.rs
similarity index 68%
rename from polkadot/node/overseer/orchestra/examples/misc.rs
rename to polkadot/node/orchestra/examples/misc.rs
index 39a755c5d0f..ffd5001d07b 100644
--- a/polkadot/node/overseer/orchestra/examples/misc.rs
+++ b/polkadot/node/orchestra/examples/misc.rs
@@ -1,3 +1,18 @@
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
use orchestra::{Spawner, *};
#[derive(Debug, Clone, Copy)]
diff --git a/polkadot/node/overseer/orchestra/examples/solo.rs b/polkadot/node/orchestra/examples/solo.rs
similarity index 64%
rename from polkadot/node/overseer/orchestra/examples/solo.rs
rename to polkadot/node/orchestra/examples/solo.rs
index 2ca53cb6486..67ebc292e46 100644
--- a/polkadot/node/overseer/orchestra/examples/solo.rs
+++ b/polkadot/node/orchestra/examples/solo.rs
@@ -1,3 +1,18 @@
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
#![allow(dead_code)] // orchestra events are not used
//! A minimal demo to be used with cargo expand.
diff --git a/polkadot/node/overseer/orchestra/proc-macro/Cargo.toml b/polkadot/node/orchestra/proc-macro/Cargo.toml
similarity index 100%
rename from polkadot/node/overseer/orchestra/proc-macro/Cargo.toml
rename to polkadot/node/orchestra/proc-macro/Cargo.toml
diff --git a/polkadot/node/overseer/orchestra/proc-macro/build.rs b/polkadot/node/orchestra/proc-macro/build.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/proc-macro/build.rs
rename to polkadot/node/orchestra/proc-macro/build.rs
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/impl_builder.rs b/polkadot/node/orchestra/proc-macro/src/impl_builder.rs
similarity index 97%
rename from polkadot/node/overseer/orchestra/proc-macro/src/impl_builder.rs
rename to polkadot/node/orchestra/proc-macro/src/impl_builder.rs
index 89515e0d104..d5a91782e8f 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/impl_builder.rs
+++ b/polkadot/node/orchestra/proc-macro/src/impl_builder.rs
@@ -1,18 +1,17 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use quote::{format_ident, quote};
use syn::{parse_quote, Path, PathSegment};
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/impl_channels_out.rs b/polkadot/node/orchestra/proc-macro/src/impl_channels_out.rs
similarity index 83%
rename from polkadot/node/overseer/orchestra/proc-macro/src/impl_channels_out.rs
rename to polkadot/node/orchestra/proc-macro/src/impl_channels_out.rs
index d697ff34da9..5b694d15229 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/impl_channels_out.rs
+++ b/polkadot/node/orchestra/proc-macro/src/impl_channels_out.rs
@@ -1,18 +1,17 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use quote::quote;
use syn::Result;
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/impl_message_wrapper.rs b/polkadot/node/orchestra/proc-macro/src/impl_message_wrapper.rs
similarity index 69%
rename from polkadot/node/overseer/orchestra/proc-macro/src/impl_message_wrapper.rs
rename to polkadot/node/orchestra/proc-macro/src/impl_message_wrapper.rs
index 19d57a69cf1..3c2f9999920 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/impl_message_wrapper.rs
+++ b/polkadot/node/orchestra/proc-macro/src/impl_message_wrapper.rs
@@ -1,18 +1,17 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use quote::quote;
use syn::{spanned::Spanned, Result};
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/impl_orchestra.rs b/polkadot/node/orchestra/proc-macro/src/impl_orchestra.rs
similarity index 91%
rename from polkadot/node/overseer/orchestra/proc-macro/src/impl_orchestra.rs
rename to polkadot/node/orchestra/proc-macro/src/impl_orchestra.rs
index 11af31d00d2..62dc27e8457 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/impl_orchestra.rs
+++ b/polkadot/node/orchestra/proc-macro/src/impl_orchestra.rs
@@ -1,18 +1,17 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use quote::quote;
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/impl_subsystem_ctx_sender.rs b/polkadot/node/orchestra/proc-macro/src/impl_subsystem_ctx_sender.rs
similarity index 96%
rename from polkadot/node/overseer/orchestra/proc-macro/src/impl_subsystem_ctx_sender.rs
rename to polkadot/node/orchestra/proc-macro/src/impl_subsystem_ctx_sender.rs
index 7987a60ba1e..fb2a4988dc4 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/impl_subsystem_ctx_sender.rs
+++ b/polkadot/node/orchestra/proc-macro/src/impl_subsystem_ctx_sender.rs
@@ -1,18 +1,17 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use proc_macro2::TokenStream;
use quote::quote;
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/lib.rs b/polkadot/node/orchestra/proc-macro/src/lib.rs
similarity index 73%
rename from polkadot/node/overseer/orchestra/proc-macro/src/lib.rs
rename to polkadot/node/orchestra/proc-macro/src/lib.rs
index cd0dcf3a422..121eda0903a 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/lib.rs
+++ b/polkadot/node/orchestra/proc-macro/src/lib.rs
@@ -1,18 +1,17 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use proc_macro2::{Ident, Span, TokenStream};
use syn::{parse_quote, spanned::Spanned, Path};
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/orchestra.rs b/polkadot/node/orchestra/proc-macro/src/orchestra.rs
similarity index 70%
rename from polkadot/node/overseer/orchestra/proc-macro/src/orchestra.rs
rename to polkadot/node/orchestra/proc-macro/src/orchestra.rs
index 5f906eed694..ab1f9af3082 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/orchestra.rs
+++ b/polkadot/node/orchestra/proc-macro/src/orchestra.rs
@@ -1,18 +1,17 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use proc_macro2::TokenStream;
use syn::{parse2, Result};
diff --git a/polkadot/node/orchestra/proc-macro/src/parse/mod.rs b/polkadot/node/orchestra/proc-macro/src/parse/mod.rs
new file mode 100644
index 00000000000..05d6cc2efcd
--- /dev/null
+++ b/polkadot/node/orchestra/proc-macro/src/parse/mod.rs
@@ -0,0 +1,38 @@
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+mod kw {
+ syn::custom_keyword!(event);
+ syn::custom_keyword!(signal);
+ syn::custom_keyword!(error);
+ syn::custom_keyword!(outgoing);
+ syn::custom_keyword!(gen);
+ syn::custom_keyword!(signal_capacity);
+ syn::custom_keyword!(message_capacity);
+ syn::custom_keyword!(subsystem);
+ syn::custom_keyword!(prefix);
+}
+
+mod parse_orchestra_attr;
+mod parse_orchestra_struct;
+
+mod parse_subsystem_attr;
+
+#[cfg(test)]
+mod tests;
+
+pub(crate) use self::{parse_orchestra_attr::*, parse_orchestra_struct::*};
+
+pub(crate) use self::parse_subsystem_attr::*;
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/parse/parse_orchestra_attr.rs b/polkadot/node/orchestra/proc-macro/src/parse/parse_orchestra_attr.rs
similarity index 89%
rename from polkadot/node/overseer/orchestra/proc-macro/src/parse/parse_orchestra_attr.rs
rename to polkadot/node/orchestra/proc-macro/src/parse/parse_orchestra_attr.rs
index f5bba725af0..27486b5697a 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/parse/parse_orchestra_attr.rs
+++ b/polkadot/node/orchestra/proc-macro/src/parse/parse_orchestra_attr.rs
@@ -1,18 +1,17 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use super::kw;
use proc_macro2::Span;
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/parse/parse_orchestra_struct.rs b/polkadot/node/orchestra/proc-macro/src/parse/parse_orchestra_struct.rs
similarity index 95%
rename from polkadot/node/overseer/orchestra/proc-macro/src/parse/parse_orchestra_struct.rs
rename to polkadot/node/orchestra/proc-macro/src/parse/parse_orchestra_struct.rs
index 9482429c566..38485e2cbcd 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/parse/parse_orchestra_struct.rs
+++ b/polkadot/node/orchestra/proc-macro/src/parse/parse_orchestra_struct.rs
@@ -1,18 +1,17 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use proc_macro2::{Span, TokenStream};
use std::collections::{hash_map::RandomState, HashMap, HashSet};
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/parse/parse_subsystem_attr.rs b/polkadot/node/orchestra/proc-macro/src/parse/parse_subsystem_attr.rs
similarity index 85%
rename from polkadot/node/overseer/orchestra/proc-macro/src/parse/parse_subsystem_attr.rs
rename to polkadot/node/orchestra/proc-macro/src/parse/parse_subsystem_attr.rs
index e27031349e6..6df4a4c8e29 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/parse/parse_subsystem_attr.rs
+++ b/polkadot/node/orchestra/proc-macro/src/parse/parse_subsystem_attr.rs
@@ -1,18 +1,17 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use super::kw;
use proc_macro2::Span;
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/parse/tests.rs b/polkadot/node/orchestra/proc-macro/src/parse/tests.rs
similarity index 89%
rename from polkadot/node/overseer/orchestra/proc-macro/src/parse/tests.rs
rename to polkadot/node/orchestra/proc-macro/src/parse/tests.rs
index cff53727564..3bcfda45db8 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/parse/tests.rs
+++ b/polkadot/node/orchestra/proc-macro/src/parse/tests.rs
@@ -1,18 +1,17 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use super::*;
use crate::{SubSysAttrItem, SubSystemAttrItems};
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/subsystem.rs b/polkadot/node/orchestra/proc-macro/src/subsystem.rs
similarity index 92%
rename from polkadot/node/overseer/orchestra/proc-macro/src/subsystem.rs
rename to polkadot/node/orchestra/proc-macro/src/subsystem.rs
index c12c742e0eb..27f50704bb9 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/subsystem.rs
+++ b/polkadot/node/orchestra/proc-macro/src/subsystem.rs
@@ -1,18 +1,17 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
//! Generates the bounds for a particular subsystem `Context` and associate `type Sender`.
//!
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/tests.rs b/polkadot/node/orchestra/proc-macro/src/tests.rs
similarity index 73%
rename from polkadot/node/overseer/orchestra/proc-macro/src/tests.rs
rename to polkadot/node/orchestra/proc-macro/src/tests.rs
index 51bae46ca4d..2b19b5f29a5 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/tests.rs
+++ b/polkadot/node/orchestra/proc-macro/src/tests.rs
@@ -1,18 +1,17 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
use super::*;
use assert_matches::assert_matches;
diff --git a/polkadot/node/overseer/orchestra/src/lib.rs b/polkadot/node/orchestra/src/lib.rs
similarity index 96%
rename from polkadot/node/overseer/orchestra/src/lib.rs
rename to polkadot/node/orchestra/src/lib.rs
index 8f872cf3a66..3f84207de6b 100644
--- a/polkadot/node/overseer/orchestra/src/lib.rs
+++ b/polkadot/node/orchestra/src/lib.rs
@@ -1,18 +1,17 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
//! # Orchestra
//!
diff --git a/polkadot/node/orchestra/src/tests.rs b/polkadot/node/orchestra/src/tests.rs
new file mode 100644
index 00000000000..4b622faf889
--- /dev/null
+++ b/polkadot/node/orchestra/src/tests.rs
@@ -0,0 +1,38 @@
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#[test]
+#[rustversion::attr(not(stable), ignore)]
+fn ui_compile_fail() {
+ // Only run the ui tests when `RUN_UI_TESTS` is set.
+ if std::env::var("RUN_UI_TESTS").is_err() {
+ return
+ }
+
+ let t = trybuild::TestCases::new();
+ t.compile_fail("tests/ui/err-*.rs");
+}
+
+#[test]
+#[rustversion::attr(not(stable), ignore)]
+fn ui_pass() {
+ // Only run the ui tests when `RUN_UI_TESTS` is set.
+ if std::env::var("RUN_UI_TESTS").is_err() {
+ return
+ }
+
+ let t = trybuild::TestCases::new();
+ t.pass("tests/ui/ok-*.rs");
+}
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-01-duplicate-consumer.rs b/polkadot/node/orchestra/tests/ui/err-01-duplicate-consumer.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-01-duplicate-consumer.rs
rename to polkadot/node/orchestra/tests/ui/err-01-duplicate-consumer.rs
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-01-duplicate-consumer.stderr b/polkadot/node/orchestra/tests/ui/err-01-duplicate-consumer.stderr
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-01-duplicate-consumer.stderr
rename to polkadot/node/orchestra/tests/ui/err-01-duplicate-consumer.stderr
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-02-enum.rs b/polkadot/node/orchestra/tests/ui/err-02-enum.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-02-enum.rs
rename to polkadot/node/orchestra/tests/ui/err-02-enum.rs
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-02-enum.stderr b/polkadot/node/orchestra/tests/ui/err-02-enum.stderr
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-02-enum.stderr
rename to polkadot/node/orchestra/tests/ui/err-02-enum.stderr
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-03-subsys-twice.rs b/polkadot/node/orchestra/tests/ui/err-03-subsys-twice.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-03-subsys-twice.rs
rename to polkadot/node/orchestra/tests/ui/err-03-subsys-twice.rs
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-03-subsys-twice.stderr b/polkadot/node/orchestra/tests/ui/err-03-subsys-twice.stderr
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-03-subsys-twice.stderr
rename to polkadot/node/orchestra/tests/ui/err-03-subsys-twice.stderr
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-04-missing-error.rs b/polkadot/node/orchestra/tests/ui/err-04-missing-error.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-04-missing-error.rs
rename to polkadot/node/orchestra/tests/ui/err-04-missing-error.rs
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-04-missing-error.stderr b/polkadot/node/orchestra/tests/ui/err-04-missing-error.stderr
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-04-missing-error.stderr
rename to polkadot/node/orchestra/tests/ui/err-04-missing-error.stderr
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-05-missing-field.rs b/polkadot/node/orchestra/tests/ui/err-05-missing-field.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-05-missing-field.rs
rename to polkadot/node/orchestra/tests/ui/err-05-missing-field.rs
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-05-missing-field.stderr b/polkadot/node/orchestra/tests/ui/err-05-missing-field.stderr
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-05-missing-field.stderr
rename to polkadot/node/orchestra/tests/ui/err-05-missing-field.stderr
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-06-missing-subsystem.rs b/polkadot/node/orchestra/tests/ui/err-06-missing-subsystem.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-06-missing-subsystem.rs
rename to polkadot/node/orchestra/tests/ui/err-06-missing-subsystem.rs
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-06-missing-subsystem.stderr b/polkadot/node/orchestra/tests/ui/err-06-missing-subsystem.stderr
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-06-missing-subsystem.stderr
rename to polkadot/node/orchestra/tests/ui/err-06-missing-subsystem.stderr
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-07-missing-spawner.rs b/polkadot/node/orchestra/tests/ui/err-07-missing-spawner.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-07-missing-spawner.rs
rename to polkadot/node/orchestra/tests/ui/err-07-missing-spawner.rs
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-07-missing-spawner.stderr b/polkadot/node/orchestra/tests/ui/err-07-missing-spawner.stderr
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-07-missing-spawner.stderr
rename to polkadot/node/orchestra/tests/ui/err-07-missing-spawner.stderr
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-08-duplicate-subsystem.rs b/polkadot/node/orchestra/tests/ui/err-08-duplicate-subsystem.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-08-duplicate-subsystem.rs
rename to polkadot/node/orchestra/tests/ui/err-08-duplicate-subsystem.rs
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-08-duplicate-subsystem.stderr b/polkadot/node/orchestra/tests/ui/err-08-duplicate-subsystem.stderr
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-08-duplicate-subsystem.stderr
rename to polkadot/node/orchestra/tests/ui/err-08-duplicate-subsystem.stderr
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-09-uninit_generic_baggage.rs b/polkadot/node/orchestra/tests/ui/err-09-uninit_generic_baggage.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-09-uninit_generic_baggage.rs
rename to polkadot/node/orchestra/tests/ui/err-09-uninit_generic_baggage.rs
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-09-uninit_generic_baggage.stderr b/polkadot/node/orchestra/tests/ui/err-09-uninit_generic_baggage.stderr
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-09-uninit_generic_baggage.stderr
rename to polkadot/node/orchestra/tests/ui/err-09-uninit_generic_baggage.stderr
diff --git a/polkadot/node/overseer/orchestra/tests/ui/ok-01-wip.rs b/polkadot/node/orchestra/tests/ui/ok-01-wip.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/ok-01-wip.rs
rename to polkadot/node/orchestra/tests/ui/ok-01-wip.rs
diff --git a/polkadot/node/overseer/Cargo.toml b/polkadot/node/overseer/Cargo.toml
index 23f92a7a2fa..2f49d013ad9 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 = { path = "./orchestra" }
+orchestra = { path = "../orchestra" }
gum = { package = "tracing-gum", path = "../gum" }
lru = "0.7"
parity-util-mem = { version = "0.11.0", default-features = false }
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/parse/mod.rs b/polkadot/node/overseer/orchestra/proc-macro/src/parse/mod.rs
deleted file mode 100644
index 3d6a6c7043a..00000000000
--- a/polkadot/node/overseer/orchestra/proc-macro/src/parse/mod.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
-
-mod kw {
- syn::custom_keyword!(event);
- syn::custom_keyword!(signal);
- syn::custom_keyword!(error);
- syn::custom_keyword!(outgoing);
- syn::custom_keyword!(gen);
- syn::custom_keyword!(signal_capacity);
- syn::custom_keyword!(message_capacity);
- syn::custom_keyword!(subsystem);
- syn::custom_keyword!(prefix);
-}
-
-mod parse_orchestra_attr;
-mod parse_orchestra_struct;
-
-mod parse_subsystem_attr;
-
-#[cfg(test)]
-mod tests;
-
-pub(crate) use self::{parse_orchestra_attr::*, parse_orchestra_struct::*};
-
-pub(crate) use self::parse_subsystem_attr::*;
diff --git a/polkadot/node/overseer/orchestra/src/tests.rs b/polkadot/node/overseer/orchestra/src/tests.rs
deleted file mode 100644
index 09de7ed4d3d..00000000000
--- a/polkadot/node/overseer/orchestra/src/tests.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
-
-#[test]
-#[rustversion::attr(not(stable), ignore)]
-fn ui_compile_fail() {
- // Only run the ui tests when `RUN_UI_TESTS` is set.
- if std::env::var("RUN_UI_TESTS").is_err() {
- return
- }
-
- let t = trybuild::TestCases::new();
- t.compile_fail("tests/ui/err-*.rs");
-}
-
-#[test]
-#[rustversion::attr(not(stable), ignore)]
-fn ui_pass() {
- // Only run the ui tests when `RUN_UI_TESTS` is set.
- if std::env::var("RUN_UI_TESTS").is_err() {
- return
- }
-
- let t = trybuild::TestCases::new();
- t.pass("tests/ui/ok-*.rs");
-}
diff --git a/polkadot/node/subsystem-types/Cargo.toml b/polkadot/node/subsystem-types/Cargo.toml
index 48639e58b27..5b455eb4484 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 = { path = "../overseer/orchestra" }
+orchestra = { path = "../orchestra" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
smallvec = "1.8.0"
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/polkadot/node/subsystem-util/Cargo.toml b/polkadot/node/subsystem-util/Cargo.toml
index 4aec7be170a..b1ad45fd0ab 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 = { package = "prioritized-metered-channel", path = "../metered-channel" }
+metered = { package = "prioritized-metered-channel", path = "../metered-channel" , "version" = "0.2.0" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
--
GitLab