Skip to content
Snippets Groups Projects
Commit c8a935d3 authored by Bastian Köcher's avatar Bastian Köcher Committed by GitHub
Browse files

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.
parent bd35fcdc
Branches gh-readonly-queue/master/pr-3542-30c32e3d8456984e19a7edf9e851b0db6135f376
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 30 additions and 21 deletions
cumulus/Cargo.lock
+ 4
− 3
View file @ c8a935d3
......@@ -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",
......
cumulus/polkadot-parachains/canvas-kusama/Cargo.toml
+ 3
− 1
View file @ c8a935d3
......@@ -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
]
cumulus/polkadot-parachains/canvas-kusama/src/constants.rs
+ 2
− 2
View file @ c8a935d3
......@@ -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;
......
cumulus/polkadot-parachains/statemine/Cargo.toml
+ 5
− 3
View file @ c8a935d3
......@@ -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",
]
cumulus/polkadot-parachains/statemine/src/constants.rs
+ 2
− 2
View file @ c8a935d3
......@@ -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;
......
cumulus/polkadot-parachains/statemint/Cargo.toml
+ 5
− 3
View file @ c8a935d3
......@@ -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",
]
cumulus/polkadot-parachains/statemint/src/constants.rs
+ 2
− 2
View file @ c8a935d3
......@@ -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;
......
cumulus/polkadot-parachains/westmint/Cargo.toml
+ 5
− 3
View file @ c8a935d3
......@@ -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",
]
cumulus/polkadot-parachains/westmint/src/constants.rs
+ 2
− 2
View file @ c8a935d3
......@@ -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;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment