From c8a935d38f9da0b94e964eed3dcabee89b2a7f93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 22 Feb 2022 23:19:19 +0100
Subject: [PATCH] Remove node-primitives (#1032)
This is a crate that shouldn't be used outside of the Substrate Node. Here the correct crate is the
`polkadot-core-primitives` to get the `Balance` type.
---
cumulus/Cargo.lock | 7 ++++---
cumulus/polkadot-parachains/canvas-kusama/Cargo.toml | 4 +++-
.../polkadot-parachains/canvas-kusama/src/constants.rs | 4 ++--
cumulus/polkadot-parachains/statemine/Cargo.toml | 8 +++++---
cumulus/polkadot-parachains/statemine/src/constants.rs | 4 ++--
cumulus/polkadot-parachains/statemint/Cargo.toml | 8 +++++---
cumulus/polkadot-parachains/statemint/src/constants.rs | 4 ++--
cumulus/polkadot-parachains/westmint/Cargo.toml | 8 +++++---
cumulus/polkadot-parachains/westmint/src/constants.rs | 4 ++--
9 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/cumulus/Cargo.lock b/cumulus/Cargo.lock
index a8c042b8611..e27b993d204 100644
--- a/cumulus/Cargo.lock
+++ b/cumulus/Cargo.lock
@@ -964,6 +964,7 @@ dependencies = [
"parachain-info",
"parachains-common",
"parity-scale-codec",
+ "polkadot-core-primitives",
"polkadot-parachain",
"polkadot-runtime-common",
"scale-info",
@@ -11274,7 +11275,6 @@ dependencies = [
"hex-literal",
"kusama-runtime-constants",
"log",
- "node-primitives",
"pallet-asset-tx-payment",
"pallet-assets",
"pallet-aura",
@@ -11294,6 +11294,7 @@ dependencies = [
"parachain-info",
"parachains-common",
"parity-scale-codec",
+ "polkadot-core-primitives",
"polkadot-parachain",
"polkadot-runtime-common",
"scale-info",
@@ -11340,7 +11341,6 @@ dependencies = [
"frame-try-runtime",
"hex-literal",
"log",
- "node-primitives",
"pallet-asset-tx-payment",
"pallet-assets",
"pallet-aura",
@@ -11360,6 +11360,7 @@ dependencies = [
"parachain-info",
"parachains-common",
"parity-scale-codec",
+ "polkadot-core-primitives",
"polkadot-parachain",
"polkadot-runtime-common",
"polkadot-runtime-constants",
@@ -12754,7 +12755,6 @@ dependencies = [
"frame-try-runtime",
"hex-literal",
"log",
- "node-primitives",
"pallet-asset-tx-payment",
"pallet-assets",
"pallet-aura",
@@ -12773,6 +12773,7 @@ dependencies = [
"parachain-info",
"parachains-common",
"parity-scale-codec",
+ "polkadot-core-primitives",
"polkadot-parachain",
"polkadot-runtime-common",
"scale-info",
diff --git a/cumulus/polkadot-parachains/canvas-kusama/Cargo.toml b/cumulus/polkadot-parachains/canvas-kusama/Cargo.toml
index fae41ce4e85..d0a4521f165 100644
--- a/cumulus/polkadot-parachains/canvas-kusama/Cargo.toml
+++ b/cumulus/polkadot-parachains/canvas-kusama/Cargo.toml
@@ -73,6 +73,7 @@ parachain-info = { path = "../pallets/parachain-info", default-features = false
# Polkadot Dependencies
polkadot-parachain = { git = 'https://github.com/paritytech/polkadot', default-features = false , branch = "master" }
polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
xcm = { git = 'https://github.com/paritytech/polkadot', default-features = false , branch = "master" }
xcm-builder = { git = 'https://github.com/paritytech/polkadot', default-features = false , branch = "master" }
@@ -142,6 +143,7 @@ std = [
"xcm/std",
"xcm-builder/std",
"xcm-executor/std",
+ "polkadot-core-primitives/std",
]
# Make contract callable functions marked as __unstable__ available. Do not enable
@@ -171,4 +173,4 @@ runtime-benchmarks = [
try-runtime = [
"frame-try-runtime",
"frame-executive/try-runtime",
-]
\ No newline at end of file
+]
diff --git a/cumulus/polkadot-parachains/canvas-kusama/src/constants.rs b/cumulus/polkadot-parachains/canvas-kusama/src/constants.rs
index 69384141a2e..8661ec78a3d 100644
--- a/cumulus/polkadot-parachains/canvas-kusama/src/constants.rs
+++ b/cumulus/polkadot-parachains/canvas-kusama/src/constants.rs
@@ -15,7 +15,7 @@
pub mod currency {
use kusama_runtime_constants as constants;
- use node_primitives::Balance;
+ use polkadot_core_primitives::Balance;
/// The existential deposit. Set to 1/10 of its parent Relay Chain.
pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
@@ -37,7 +37,7 @@ pub mod fee {
constants::ExtrinsicBaseWeight, WeightToFeeCoefficient, WeightToFeeCoefficients,
WeightToFeePolynomial,
};
- use node_primitives::Balance;
+ use polkadot_core_primitives::Balance;
use smallvec::smallvec;
pub use sp_runtime::Perbill;
diff --git a/cumulus/polkadot-parachains/statemine/Cargo.toml b/cumulus/polkadot-parachains/statemine/Cargo.toml
index 43153d5b4d4..3d4c83d4382 100644
--- a/cumulus/polkadot-parachains/statemine/Cargo.toml
+++ b/cumulus/polkadot-parachains/statemine/Cargo.toml
@@ -49,8 +49,6 @@ pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/parityt
pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-
# Cumulus dependencies
cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false }
cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false }
@@ -69,6 +67,7 @@ parachains-common = { path = "../parachains-common", default-features = false }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
@@ -158,6 +157,9 @@ std = [
"xcm-builder/std",
"xcm-executor/std",
"sp-consensus-aura/std",
- "node-primitives/std",
"parachains-common/std",
+ "polkadot-parachain/std",
+ "polkadot-runtime-common/std",
+ "polkadot-core-primitives/std",
+ "kusama-runtime-constants/std",
]
diff --git a/cumulus/polkadot-parachains/statemine/src/constants.rs b/cumulus/polkadot-parachains/statemine/src/constants.rs
index 69384141a2e..8661ec78a3d 100644
--- a/cumulus/polkadot-parachains/statemine/src/constants.rs
+++ b/cumulus/polkadot-parachains/statemine/src/constants.rs
@@ -15,7 +15,7 @@
pub mod currency {
use kusama_runtime_constants as constants;
- use node_primitives::Balance;
+ use polkadot_core_primitives::Balance;
/// The existential deposit. Set to 1/10 of its parent Relay Chain.
pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
@@ -37,7 +37,7 @@ pub mod fee {
constants::ExtrinsicBaseWeight, WeightToFeeCoefficient, WeightToFeeCoefficients,
WeightToFeePolynomial,
};
- use node_primitives::Balance;
+ use polkadot_core_primitives::Balance;
use smallvec::smallvec;
pub use sp_runtime::Perbill;
diff --git a/cumulus/polkadot-parachains/statemint/Cargo.toml b/cumulus/polkadot-parachains/statemint/Cargo.toml
index b9b418fad77..ac35deb0763 100644
--- a/cumulus/polkadot-parachains/statemint/Cargo.toml
+++ b/cumulus/polkadot-parachains/statemint/Cargo.toml
@@ -49,8 +49,6 @@ pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/parityt
pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-
# Cumulus dependencies
cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false }
cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false }
@@ -69,6 +67,7 @@ parachains-common = { path = "../parachains-common", default-features = false }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
polkadot-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
@@ -158,6 +157,9 @@ std = [
"xcm-builder/std",
"xcm-executor/std",
"sp-consensus-aura/std",
- "node-primitives/std",
"parachains-common/std",
+ "polkadot-parachain/std",
+ "polkadot-runtime-common/std",
+ "polkadot-core-primitives/std",
+ "polkadot-runtime-constants/std",
]
diff --git a/cumulus/polkadot-parachains/statemint/src/constants.rs b/cumulus/polkadot-parachains/statemint/src/constants.rs
index cc91996f64d..e6886fcb75b 100644
--- a/cumulus/polkadot-parachains/statemint/src/constants.rs
+++ b/cumulus/polkadot-parachains/statemint/src/constants.rs
@@ -14,7 +14,7 @@
// limitations under the License.
pub mod currency {
- use node_primitives::Balance;
+ use polkadot_core_primitives::Balance;
use polkadot_runtime_constants as constants;
/// The existential deposit. Set to 1/10 of its parent Relay Chain (v9010).
@@ -37,7 +37,7 @@ pub mod fee {
constants::ExtrinsicBaseWeight, WeightToFeeCoefficient, WeightToFeeCoefficients,
WeightToFeePolynomial,
};
- use node_primitives::Balance;
+ use polkadot_core_primitives::Balance;
use smallvec::smallvec;
pub use sp_runtime::Perbill;
diff --git a/cumulus/polkadot-parachains/westmint/Cargo.toml b/cumulus/polkadot-parachains/westmint/Cargo.toml
index e9616afbdd1..0edeef4cd9c 100644
--- a/cumulus/polkadot-parachains/westmint/Cargo.toml
+++ b/cumulus/polkadot-parachains/westmint/Cargo.toml
@@ -48,8 +48,6 @@ pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/parityt
pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-
# Cumulus dependencies
cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false }
cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false }
@@ -68,6 +66,7 @@ parachains-common = { path = "../parachains-common", default-features = false }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
westend-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
@@ -156,6 +155,9 @@ std = [
"xcm-builder/std",
"xcm-executor/std",
"sp-consensus-aura/std",
- "node-primitives/std",
"parachains-common/std",
+ "polkadot-parachain/std",
+ "polkadot-runtime-common/std",
+ "polkadot-core-primitives/std",
+ "westend-runtime-constants/std",
]
diff --git a/cumulus/polkadot-parachains/westmint/src/constants.rs b/cumulus/polkadot-parachains/westmint/src/constants.rs
index 10a8ebbe351..f4f5054ce40 100644
--- a/cumulus/polkadot-parachains/westmint/src/constants.rs
+++ b/cumulus/polkadot-parachains/westmint/src/constants.rs
@@ -14,7 +14,7 @@
// limitations under the License.
pub mod currency {
- use node_primitives::Balance;
+ use polkadot_core_primitives::Balance;
use westend_runtime_constants as constants;
/// The existential deposit. Set to 1/10 of its parent Relay Chain.
@@ -37,7 +37,7 @@ pub mod fee {
constants::ExtrinsicBaseWeight, WeightToFeeCoefficient, WeightToFeeCoefficients,
WeightToFeePolynomial,
};
- use node_primitives::Balance;
+ use polkadot_core_primitives::Balance;
use smallvec::smallvec;
pub use sp_runtime::Perbill;
--
GitLab