Skip to content

Commit

Permalink
Omni-Node renamings
Browse files Browse the repository at this point in the history 
- polkadot-parachain -> polkadot-omni-node
- polkadot-parachain-lib -> polkadot-omni-node-lib
- moved polkadot-parachain-bin to separate folder under
  polkadot-parachain-omni-node
  • Loading branch information
@serban300
serban300 committed Oct 3, 2024
1 parent 8614dc0 commit f1695a8
Show file tree
Hide file tree
Showing 85 changed files with 127 additions and 127 deletions.
132 changes: 66 additions & 66 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ members = [
"cumulus/parachains/runtimes/test-utils",
"cumulus/parachains/runtimes/testing/penpal",
"cumulus/parachains/runtimes/testing/rococo-parachain",
"cumulus/polkadot-parachain",
"cumulus/polkadot-parachain/polkadot-parachain-lib",
"cumulus/polkadot-omni-node/polkadot-omni-node-lib",
"cumulus/polkadot-omni-node/polkadot-parachain",
"cumulus/primitives/aura",
"cumulus/primitives/core",
"cumulus/primitives/parachain-inherent",
Expand Down Expand Up @@ -544,7 +544,7 @@ members = [
]

default-members = [
"cumulus/polkadot-parachain",
"cumulus/polkadot-omni-node/polkadot-parachain",
"polkadot",
"substrate/bin/node/cli",
]
Expand Down Expand Up @@ -1057,8 +1057,8 @@ polkadot-node-subsystem = { path = "polkadot/node/subsystem", default-features =
polkadot-node-subsystem-test-helpers = { path = "polkadot/node/subsystem-test-helpers" }
polkadot-node-subsystem-types = { path = "polkadot/node/subsystem-types", default-features = false }
polkadot-node-subsystem-util = { path = "polkadot/node/subsystem-util", default-features = false }
polkadot-omni-node-lib = { path = "cumulus/polkadot-omni-node/polkadot-omni-node-lib", default-features = false }
polkadot-overseer = { path = "polkadot/node/overseer", default-features = false }
polkadot-parachain-lib = { path = "cumulus/polkadot-parachain/polkadot-parachain-lib", default-features = false }
polkadot-parachain-primitives = { path = "polkadot/parachain", default-features = false }
polkadot-primitives = { path = "polkadot/primitives", default-features = false }
polkadot-primitives-test-helpers = { path = "polkadot/primitives/test-helpers" }
Expand Down
2 changes: 1 addition & 1 deletion ...rachain/polkadot-parachain-lib/Cargo.toml → ...ni-node/polkadot-omni-node-lib/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "polkadot-parachain-lib"
name = "polkadot-omni-node-lib"
version = "0.1.0"
authors.workspace = true
edition.workspace = true
Expand Down
0 ...rachain/polkadot-parachain-lib/src/cli.rs → ...ni-node/polkadot-omni-node-lib/src/cli.rs
View file
File renamed without changes.
0 ...ain/polkadot-parachain-lib/src/command.rs → ...ode/polkadot-omni-node-lib/src/command.rs
View file
File renamed without changes.
0 ...polkadot-parachain-lib/src/common/aura.rs → ...polkadot-omni-node-lib/src/common/aura.rs
View file
File renamed without changes.
0 ...ot-parachain-lib/src/common/chain_spec.rs → ...ot-omni-node-lib/src/common/chain_spec.rs
View file
File renamed without changes.
0 ...kadot-parachain-lib/src/common/command.rs → ...kadot-omni-node-lib/src/common/command.rs
View file
File renamed without changes.
0 .../polkadot-parachain-lib/src/common/mod.rs → .../polkadot-omni-node-lib/src/common/mod.rs
View file
File renamed without changes.
0 .../polkadot-parachain-lib/src/common/rpc.rs → .../polkadot-omni-node-lib/src/common/rpc.rs
View file
File renamed without changes.
0 ...kadot-parachain-lib/src/common/runtime.rs → ...kadot-omni-node-lib/src/common/runtime.rs
View file
File renamed without changes.
0 ...polkadot-parachain-lib/src/common/spec.rs → ...polkadot-omni-node-lib/src/common/spec.rs
View file
File renamed without changes.
0 ...olkadot-parachain-lib/src/common/types.rs → ...olkadot-omni-node-lib/src/common/types.rs
View file
File renamed without changes.
0 ...parachain-lib/src/fake_runtime_api/mod.rs → ...omni-node-lib/src/fake_runtime_api/mod.rs
View file
File renamed without changes.
0 ...rachain-lib/src/fake_runtime_api/utils.rs → ...ni-node-lib/src/fake_runtime_api/utils.rs
View file
File renamed without changes.
0 ...rachain/polkadot-parachain-lib/src/lib.rs → ...ni-node/polkadot-omni-node-lib/src/lib.rs
View file
File renamed without changes.
0 .../polkadot-parachain-lib/src/nodes/aura.rs → .../polkadot-omni-node-lib/src/nodes/aura.rs
View file
File renamed without changes.
0 ...ot-parachain-lib/src/nodes/manual_seal.rs → ...ot-omni-node-lib/src/nodes/manual_seal.rs
View file
File renamed without changes.
0 ...n/polkadot-parachain-lib/src/nodes/mod.rs → ...e/polkadot-omni-node-lib/src/nodes/mod.rs
View file
File renamed without changes.
0 ...polkadot-parachain-lib/src/nodes/shell.rs → ...polkadot-omni-node-lib/src/nodes/shell.rs
View file
File renamed without changes.
0 ...-lib/src/tests/benchmark_storage_works.rs → ...-lib/src/tests/benchmark_storage_works.rs
View file
File renamed without changes.
0 ...olkadot-parachain-lib/src/tests/common.rs → ...olkadot-omni-node-lib/src/tests/common.rs
View file
File renamed without changes.
0 ...ib/src/tests/polkadot_argument_parsing.rs → ...ib/src/tests/polkadot_argument_parsing.rs
View file
File renamed without changes.
0 ...hain-lib/src/tests/polkadot_mdns_issue.rs → ...node-lib/src/tests/polkadot_mdns_issue.rs
View file
File renamed without changes.
0 ...achain-lib/src/tests/purge_chain_works.rs → ...i-node-lib/src/tests/purge_chain_works.rs
View file
File renamed without changes.
0 ...c/tests/running_the_node_and_interrupt.rs → ...c/tests/running_the_node_and_interrupt.rs
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions cumulus/polkadot-parachain/Cargo.toml → ...t-omni-node/polkadot-parachain/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ serde = { features = ["derive"], workspace = true, default-features = true }
serde_json = { workspace = true, default-features = true }

# Local
polkadot-parachain-lib = { features = ["rococo-native", "westend-native"], workspace = true }
polkadot-omni-node-lib = { features = ["rococo-native", "westend-native"], workspace = true }
rococo-parachain-runtime = { workspace = true }
shell-runtime = { workspace = true }
glutton-westend-runtime = { workspace = true }
Expand Down Expand Up @@ -68,7 +68,7 @@ default = []
runtime-benchmarks = [
"cumulus-primitives-core/runtime-benchmarks",
"parachains-common/runtime-benchmarks",
"polkadot-parachain-lib/runtime-benchmarks",
"polkadot-omni-node-lib/runtime-benchmarks",
"sc-service/runtime-benchmarks",

"asset-hub-rococo-runtime/runtime-benchmarks",
Expand All @@ -86,7 +86,7 @@ runtime-benchmarks = [
"rococo-parachain-runtime/runtime-benchmarks",
]
try-runtime = [
"polkadot-parachain-lib/try-runtime",
"polkadot-omni-node-lib/try-runtime",

"asset-hub-rococo-runtime/try-runtime",
"asset-hub-westend-runtime/try-runtime",
Expand Down
0 cumulus/polkadot-parachain/build.rs → ...dot-omni-node/polkadot-parachain/build.rs
View file
File renamed without changes.
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/asset-hub-kusama.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/asset-hub-kusama.json
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/asset-hub-polkadot.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/asset-hub-polkadot.json
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/asset-hub-rococo.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/asset-hub-rococo.json
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/asset-hub-westend.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/asset-hub-westend.json
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/bridge-hub-kusama.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/bridge-hub-kusama.json
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/bridge-hub-polkadot.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/bridge-hub-polkadot.json
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/bridge-hub-rococo.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/bridge-hub-rococo.json
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/bridge-hub-westend.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/bridge-hub-westend.json
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/collectives-polkadot.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/collectives-polkadot.json
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/collectives-westend.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/collectives-westend.json
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/coretime-kusama.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/coretime-kusama.json
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/coretime-polkadot.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/coretime-polkadot.json
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/coretime-rococo.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/coretime-rococo.json
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/coretime-westend.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/coretime-westend.json
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/people-kusama.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/people-kusama.json
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/people-polkadot.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/people-polkadot.json
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/people-rococo.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/people-rococo.json
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/people-westend.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/people-westend.json
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/tick.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/tick.json
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/track.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/track.json
1 change: 1 addition & 0 deletions cumulus/polkadot-omni-node/polkadot-parachain/chain-specs/trick.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../parachains/chain-specs/trick.json
2 changes: 1 addition & 1 deletion ...ot-parachain/src/chain_spec/asset_hubs.rs → ...ot-parachain/src/chain_spec/asset_hubs.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 polkadot_parachain_lib::chain_spec::{Extensions, GenericChainSpec};
use polkadot_omni_node_lib::chain_spec::{Extensions, GenericChainSpec};
use sc_service::ChainType;

pub fn asset_hub_westend_development_config() -> GenericChainSpec {
Expand Down
6 changes: 3 additions & 3 deletions ...t-parachain/src/chain_spec/bridge_hubs.rs → ...t-parachain/src/chain_spec/bridge_hubs.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// along with Cumulus. If not, see <http://www.gnu.org/licenses/>.

use cumulus_primitives_core::ParaId;
use polkadot_parachain_lib::chain_spec::GenericChainSpec;
use polkadot_omni_node_lib::chain_spec::GenericChainSpec;
use sc_chain_spec::{ChainSpec, ChainType};
use std::str::FromStr;

Expand Down Expand Up @@ -127,7 +127,7 @@ fn ensure_id(id: &str) -> Result<&str, String> {
/// Sub-module for Rococo setup
pub mod rococo {
use super::{ChainType, ParaId};
use polkadot_parachain_lib::chain_spec::{Extensions, GenericChainSpec};
use polkadot_omni_node_lib::chain_spec::{Extensions, GenericChainSpec};

pub(crate) const BRIDGE_HUB_ROCOCO: &str = "bridge-hub-rococo";
pub(crate) const BRIDGE_HUB_ROCOCO_LOCAL: &str = "bridge-hub-rococo-local";
Expand Down Expand Up @@ -175,7 +175,7 @@ pub mod kusama {
/// Sub-module for Westend setup.
pub mod westend {
use super::{ChainType, ParaId};
use polkadot_parachain_lib::chain_spec::{Extensions, GenericChainSpec};
use polkadot_omni_node_lib::chain_spec::{Extensions, GenericChainSpec};

pub(crate) const BRIDGE_HUB_WESTEND: &str = "bridge-hub-westend";
pub(crate) const BRIDGE_HUB_WESTEND_LOCAL: &str = "bridge-hub-westend-local";
Expand Down
2 changes: 1 addition & 1 deletion ...t-parachain/src/chain_spec/collectives.rs → ...t-parachain/src/chain_spec/collectives.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 polkadot_parachain_lib::chain_spec::{Extensions, GenericChainSpec};
use polkadot_omni_node_lib::chain_spec::{Extensions, GenericChainSpec};
use sc_service::ChainType;

/// Collectives Westend Development Config.
Expand Down
8 changes: 4 additions & 4 deletions ...adot-parachain/src/chain_spec/coretime.rs → ...adot-parachain/src/chain_spec/coretime.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// along with Cumulus. If not, see <http://www.gnu.org/licenses/>.

use cumulus_primitives_core::ParaId;
use polkadot_parachain_lib::chain_spec::GenericChainSpec;
use polkadot_omni_node_lib::chain_spec::GenericChainSpec;
use sc_chain_spec::{ChainSpec, ChainType};
use std::{borrow::Cow, str::FromStr};

Expand Down Expand Up @@ -118,7 +118,7 @@ impl CoretimeRuntimeType {
CoretimeRuntimeType::RococoDevelopment =>
Ok(Box::new(rococo::local_config(*self, "rococo-dev"))),
CoretimeRuntimeType::Westend => Ok(Box::new(GenericChainSpec::from_json_bytes(
&include_bytes!("../../../parachains/chain-specs/coretime-westend.json")[..],
&include_bytes!("../../chain-specs/coretime-westend.json")[..],
)?)),
CoretimeRuntimeType::WestendLocal =>
Ok(Box::new(westend::local_config(*self, "westend-local"))),
Expand Down Expand Up @@ -150,7 +150,7 @@ pub mod rococo {
get_account_id_from_seed, get_collator_keys_from_seed, SAFE_XCM_VERSION,
};
use parachains_common::{AccountId, AuraId, Balance};
use polkadot_parachain_lib::chain_spec::{Extensions, GenericChainSpec};
use polkadot_omni_node_lib::chain_spec::{Extensions, GenericChainSpec};
use sc_chain_spec::ChainType;
use sp_core::sr25519;

Expand Down Expand Up @@ -248,7 +248,7 @@ pub mod westend {
get_account_id_from_seed, get_collator_keys_from_seed, SAFE_XCM_VERSION,
};
use parachains_common::{AccountId, AuraId, Balance};
use polkadot_parachain_lib::chain_spec::Extensions;
use polkadot_omni_node_lib::chain_spec::Extensions;
use sp_core::sr25519;

pub(crate) const CORETIME_WESTEND: &str = "coretime-westend";
Expand Down
2 changes: 1 addition & 1 deletion ...kadot-parachain/src/chain_spec/glutton.rs → ...kadot-parachain/src/chain_spec/glutton.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
use crate::chain_spec::get_account_id_from_seed;
use cumulus_primitives_core::ParaId;
use parachains_common::AuraId;
use polkadot_parachain_lib::chain_spec::{Extensions, GenericChainSpec};
use polkadot_omni_node_lib::chain_spec::{Extensions, GenericChainSpec};
use sc_service::ChainType;
use sp_core::sr25519;

Expand Down
2 changes: 1 addition & 1 deletion .../polkadot-parachain/src/chain_spec/mod.rs → .../polkadot-parachain/src/chain_spec/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use cumulus_primitives_core::ParaId;
pub(crate) use parachains_common::genesis_config_helpers::{
get_account_id_from_seed, get_collator_keys_from_seed, get_from_seed,
};
use polkadot_parachain_lib::{
use polkadot_omni_node_lib::{
chain_spec::{GenericChainSpec, LoadSpec},
runtime::{
AuraConsensusId, BlockNumber, Consensus, Runtime, RuntimeResolver as RuntimeResolverT,
Expand Down
2 changes: 1 addition & 1 deletion ...lkadot-parachain/src/chain_spec/penpal.rs → ...lkadot-parachain/src/chain_spec/penpal.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
use crate::chain_spec::{get_account_id_from_seed, get_collator_keys_from_seed, SAFE_XCM_VERSION};
use cumulus_primitives_core::ParaId;
use parachains_common::{AccountId, AuraId};
use polkadot_parachain_lib::chain_spec::{Extensions, GenericChainSpec};
use polkadot_omni_node_lib::chain_spec::{Extensions, GenericChainSpec};
use sc_service::ChainType;
use sp_core::sr25519;

Expand Down
Loading

0 comments on commit f1695a8

Please sign in to comment.