The great refactor (#325)

* Move pallets to pallets folder and rename them

* Move genesis file to service

* Rename primitives to primitives-core

* Delete cumulus-runtime

* Move stuff to client folder and rename

test/client/Cargo.toml

@@ -26,7 +26,7 @@ pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "m
 cumulus-test-runtime = { path = "../runtime" }
 cumulus-test-service = { path = "../service" }
 cumulus-test-relay-sproof-builder = { path = "../relay-sproof-builder" }
-cumulus-primitives = { path = "../../primitives" }
+cumulus-primitives-core = { path = "../../primitives/core" }
 
 # Polkadot deps
 polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }

test/client/src/block_builder.rs

@@ -15,7 +15,7 @@
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
 use crate::{Backend, Client};
-use cumulus_primitives::{
+use cumulus_primitives_core::{
 	inherents::{SystemInherentData, SYSTEM_INHERENT_IDENTIFIER}, PersistedValidationData,
 };
 use cumulus_test_runtime::{Block, GetLastTimestamp};

test/relay-sproof-builder/Cargo.toml

@@ -17,7 +17,7 @@ sp-std = { git = "https://github.com/paritytech/substrate", default-features = f
 polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 
 # Cumulus dependencies
-cumulus-primitives = { path = "../../primitives", default-features = false }
+cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
 
 [features]
 default = [ "std" ]
@@ -26,5 +26,5 @@ std = [
 	"sp-state-machine/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"cumulus-primitives/std",
+	"cumulus-primitives-core/std",
 ]

test/relay-sproof-builder/src/lib.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
-use cumulus_primitives::{relay_chain, AbridgedHostConfiguration, AbridgedHrmpChannel, ParaId};
+use cumulus_primitives_core::{relay_chain, AbridgedHostConfiguration, AbridgedHrmpChannel, ParaId};
 use sp_runtime::traits::HashFor;
 use sp_state_machine::MemoryDB;
 use sp_std::collections::btree_map::BTreeMap;
@@ -44,7 +44,7 @@ impl Default for RelayStateSproofBuilder {
 	fn default() -> Self {
 		RelayStateSproofBuilder {
 			para_id: ParaId::from(200),
-			host_config: cumulus_primitives::AbridgedHostConfiguration {
+			host_config: cumulus_primitives_core::AbridgedHostConfiguration {
 				max_code_size: 2 * 1024 * 1024,
 				max_head_data_size: 1024 * 1024,
 				max_upward_queue_count: 8,

test/runtime/Cargo.toml

@@ -30,9 +30,8 @@ sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default
 sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
 
 # Cumulus dependencies
-cumulus-parachain-system = { path = "../../parachain-system", default-features = false }
-cumulus-primitives = { path = "../../primitives", default-features = false }
-cumulus-runtime = { path = "../../runtime", default-features = false }
+cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false }
+cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
 
 # Polkadot dependencies
 polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
@@ -44,9 +43,8 @@ substrate-wasm-builder = "3.0.0"
 default = [ "std" ]
 std = [
 	"codec/std",
-	"cumulus-parachain-system/std",
-	"cumulus-primitives/std",
-	"cumulus-runtime/std",
+	"cumulus-pallet-parachain-system/std",
+	"cumulus-primitives-core/std",
 	"frame-executive/std",
 	"frame-support/std",
 	"frame-system/std",

test/runtime/src/lib.rs

@@ -207,7 +207,7 @@ impl pallet_sudo::Config for Runtime {
 	type Event = Event;
 }
 
-impl cumulus_parachain_system::Config for Runtime {
+impl cumulus_pallet_parachain_system::Config for Runtime {
 	type SelfParaId = ParachainId;
 	type Event = Event;
 	type OnValidationData = ();
@@ -216,7 +216,7 @@ impl cumulus_parachain_system::Config for Runtime {
 }
 
 parameter_types! {
-	pub storage ParachainId: cumulus_primitives::ParaId = 100.into();
+	pub storage ParachainId: cumulus_primitives_core::ParaId = 100.into();
 }
 
 construct_runtime! {
@@ -230,7 +230,7 @@ construct_runtime! {
 		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
 		Sudo: pallet_sudo::{Module, Call, Storage, Config<T>, Event<T>},
 		RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Call, Storage},
-		ParachainSystem: cumulus_parachain_system::{Module, Call, Storage, Inherent, Event},
+		ParachainSystem: cumulus_pallet_parachain_system::{Module, Call, Storage, Inherent, Event},
 		TransactionPayment: pallet_transaction_payment::{Module, Storage},
 	}
 }
@@ -371,4 +371,4 @@ impl_runtime_apis! {
 	}
 }
 
-cumulus_runtime::register_validate_block!(Block, Executive);
+cumulus_pallet_parachain_system::register_validate_block!(Block, Executive);

test/service/Cargo.toml

@@ -43,10 +43,10 @@ polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch
 polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" }
 
 # Cumulus
-cumulus-consensus = { path = "../../consensus" }
-cumulus-network = { path = "../../network" }
-cumulus-primitives = { path = "../../primitives" }
-cumulus-service = { path = "../../service" }
+cumulus-client-consensus = { path = "../../client/consensus" }
+cumulus-client-network = { path = "../../client/network" }
+cumulus-client-service = { path = "../../client/service" }
+cumulus-primitives-core = { path = "../../primitives/core" }
 cumulus-test-runtime = { path = "../runtime" }
 
 # RPC related dependencies

test/service/src/chain_spec.rs

@@ -16,7 +16,7 @@
 
 #![allow(missing_docs)]
 
-use cumulus_primitives::ParaId;
+use cumulus_primitives_core::ParaId;
 use cumulus_test_runtime::{AccountId, Signature};
 use sc_chain_spec::{ChainSpecExtension, ChainSpecGroup};
 use sc_service::ChainType;

test/service/src/genesis.rs

@@ -15,7 +15,8 @@
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
 use codec::Encode;
-use cumulus_primitives::{genesis::generate_genesis_block, ParaId};
+use cumulus_primitives_core::ParaId;
+use cumulus_client_service::genesis::generate_genesis_block;
 use cumulus_test_runtime::Block;
 use polkadot_primitives::v0::HeadData;
 use sp_runtime::traits::Block as BlockT;

test/service/src/lib.rs

@@ -26,9 +26,9 @@ pub use cumulus_test_runtime as runtime;
 pub use genesis::*;
 
 use core::future::Future;
-use cumulus_network::BlockAnnounceValidator;
-use cumulus_primitives::ParaId;
-use cumulus_service::{
+use cumulus_client_network::BlockAnnounceValidator;
+use cumulus_primitives_core::ParaId;
+use cumulus_client_service::{
 	prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams,
 };
 use cumulus_test_runtime::{NodeBlock as Block, RuntimeApi};
@@ -93,7 +93,7 @@ pub fn new_partial(
 		client.clone(),
 	);
 
-	let import_queue = cumulus_consensus::import_queue::import_queue(
+	let import_queue = cumulus_client_consensus::import_queue::import_queue(
 		client.clone(),
 		client.clone(),
 		inherent_data_providers.clone(),

test/service/tests/integration.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-use cumulus_primitives::ParaId;
+use cumulus_primitives_core::ParaId;
 use cumulus_test_service::initial_head_data;
 use futures::join;
 use sc_service::TaskExecutor;