From ec189333845fffebd45bf023b0797d6a4f121d8d Mon Sep 17 00:00:00 2001
From: Joshy Orndorff <JoshOrndorff@users.noreply.github.com>
Date: Wed, 22 Nov 2023 17:21:20 -0500
Subject: [PATCH] Remove `#[macro_use]` annotation from `mod service` in all
nodes. (#2456)
This PR removes `#[macro_use]` from the service module in each of the
Substrate nodes in the repo.
* Parachain Template
* Polkadot Parachain
* Minimal Node
* Node Template
* Kitchen Sink Node
IDK why this annotation was present, maybe from when we had the
`new_partial!` macro?
---------
Co-authored-by: Joshy Orndorff <git-user-email.h0ly5@simplelogin.com>
---
cumulus/parachain-template/node/src/main.rs | 3 +--
cumulus/polkadot-parachain/src/main.rs | 3 +--
substrate/bin/minimal/node/src/main.rs | 3 +--
substrate/bin/node-template/node/src/main.rs | 5 ++---
substrate/bin/node/cli/src/lib.rs | 6 ++----
5 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/cumulus/parachain-template/node/src/main.rs b/cumulus/parachain-template/node/src/main.rs
index ba9f28b354f..12738a6793c 100644
--- a/cumulus/parachain-template/node/src/main.rs
+++ b/cumulus/parachain-template/node/src/main.rs
@@ -3,11 +3,10 @@
#![warn(missing_docs)]
mod chain_spec;
-#[macro_use]
-mod service;
mod cli;
mod command;
mod rpc;
+mod service;
fn main() -> sc_cli::Result<()> {
command::run()
diff --git a/cumulus/polkadot-parachain/src/main.rs b/cumulus/polkadot-parachain/src/main.rs
index e40af8128f7..26d7dae4b8a 100644
--- a/cumulus/polkadot-parachain/src/main.rs
+++ b/cumulus/polkadot-parachain/src/main.rs
@@ -20,11 +20,10 @@
#![warn(unused_extern_crates)]
mod chain_spec;
-#[macro_use]
-mod service;
mod cli;
mod command;
mod rpc;
+mod service;
fn main() -> sc_cli::Result<()> {
command::run()
diff --git a/substrate/bin/minimal/node/src/main.rs b/substrate/bin/minimal/node/src/main.rs
index 900651fd1fd..3cf7d98311e 100644
--- a/substrate/bin/minimal/node/src/main.rs
+++ b/substrate/bin/minimal/node/src/main.rs
@@ -19,11 +19,10 @@
#![warn(missing_docs)]
mod chain_spec;
-#[macro_use]
-mod service;
mod cli;
mod command;
mod rpc;
+mod service;
fn main() -> sc_cli::Result<()> {
command::run()
diff --git a/substrate/bin/node-template/node/src/main.rs b/substrate/bin/node-template/node/src/main.rs
index 426cbabb6fb..8918dd43a01 100644
--- a/substrate/bin/node-template/node/src/main.rs
+++ b/substrate/bin/node-template/node/src/main.rs
@@ -1,13 +1,12 @@
//! Substrate Node Template CLI library.
#![warn(missing_docs)]
-mod chain_spec;
-#[macro_use]
-mod service;
mod benchmarking;
+mod chain_spec;
mod cli;
mod command;
mod rpc;
+mod service;
fn main() -> sc_cli::Result<()> {
command::run()
diff --git a/substrate/bin/node/cli/src/lib.rs b/substrate/bin/node/cli/src/lib.rs
index 2fe238ef316..0ff544932a9 100644
--- a/substrate/bin/node/cli/src/lib.rs
+++ b/substrate/bin/node/cli/src/lib.rs
@@ -30,16 +30,14 @@
#![warn(missing_docs)]
-pub mod chain_spec;
-
-#[macro_use]
-pub mod service;
#[cfg(feature = "cli")]
mod benchmarking;
+pub mod chain_spec;
#[cfg(feature = "cli")]
mod cli;
#[cfg(feature = "cli")]
mod command;
+pub mod service;
#[cfg(feature = "cli")]
pub use cli::*;
--
GitLab