From 67770746915e5f76bc02b26b084a358738cd5ed3 Mon Sep 17 00:00:00 2001 From: Nazar Mokrynskyi Date: Mon, 8 Jan 2024 19:29:06 +0200 Subject: [PATCH] Make `subspace-node` not a library anymore --- crates/subspace-node/src/{lib.rs => cli.rs} | 9 ++------- .../subspace-node/src/{bin/subspace-node.rs => main.rs} | 9 +++++++-- 2 files changed, 9 insertions(+), 9 deletions(-) rename crates/subspace-node/src/{lib.rs => cli.rs} (98%) rename crates/subspace-node/src/{bin/subspace-node.rs => main.rs} (99%) diff --git a/crates/subspace-node/src/lib.rs b/crates/subspace-node/src/cli.rs similarity index 98% rename from crates/subspace-node/src/lib.rs rename to crates/subspace-node/src/cli.rs index 45fb58b4ee..ad8afac5c0 100644 --- a/crates/subspace-node/src/lib.rs +++ b/crates/subspace-node/src/cli.rs @@ -14,12 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -//! Subspace Node library. - -pub mod chain_spec; -mod chain_spec_utils; -pub mod domain; - +use crate::chain_spec; use clap::Parser; use sc_cli::{RunCmd, SubstrateCli}; use sc_service::ChainSpec; @@ -125,7 +120,7 @@ pub enum Subcommand { /// Run domain sub-commands. #[clap(subcommand)] - Domain(domain::cli::Subcommand), + Domain(crate::domain::cli::Subcommand), /// Sub-commands concerned with benchmarking. #[cfg(feature = "runtime-benchmarks")] diff --git a/crates/subspace-node/src/bin/subspace-node.rs b/crates/subspace-node/src/main.rs similarity index 99% rename from crates/subspace-node/src/bin/subspace-node.rs rename to crates/subspace-node/src/main.rs index ec71c62505..ccbf3456ae 100644 --- a/crates/subspace-node/src/bin/subspace-node.rs +++ b/crates/subspace-node/src/main.rs @@ -16,6 +16,13 @@ //! Subspace node implementation. +mod chain_spec; +mod chain_spec_utils; +mod cli; +mod domain; + +use crate::cli::{Cli, Subcommand}; +use crate::domain::{DomainCli, DomainInstanceStarter, DomainSubcommand}; use cross_domain_message_gossip::GossipWorkerBuilder; use domain_client_operator::Bootstrapper; use domain_runtime_primitives::opaque::Block as DomainBlock; @@ -37,8 +44,6 @@ use sp_core::traits::SpawnEssentialNamed; use sp_io::SubstrateHostFunctions; use sp_messenger::messages::ChainId; use sp_wasm_interface::ExtendedHostFunctions; -use subspace_node::domain::{DomainCli, DomainInstanceStarter, DomainSubcommand}; -use subspace_node::{Cli, Subcommand}; use subspace_proof_of_space::chia::ChiaTable; use subspace_runtime::{Block, ExecutorDispatch, RuntimeApi}; use subspace_service::{DsnConfig, SubspaceConfiguration, SubspaceNetworking};