diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index 55ed745e0ac9c882ccc64d455f98b81caab460d6..d902a4792ee543600a2606d8d9e081e2a7fbe3ba 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -3122,6 +3122,7 @@ dependencies = [
"frame-system-rpc-runtime-api",
"frame-try-runtime",
"hex-literal",
+ "kusama-runtime-constants",
"log",
"pallet-authority-discovery",
"pallet-authorship",
@@ -3197,6 +3198,17 @@ dependencies = [
"xcm-executor",
]
+[[package]]
+name = "kusama-runtime-constants"
+version = "0.9.13"
+dependencies = [
+ "frame-support",
+ "polkadot-primitives",
+ "polkadot-runtime-common",
+ "smallvec",
+ "sp-runtime",
+]
+
[[package]]
name = "kv-log-macro"
version = "1.0.7"
@@ -6692,6 +6704,7 @@ dependencies = [
"parity-scale-codec",
"polkadot-primitives",
"polkadot-runtime-common",
+ "polkadot-runtime-constants",
"polkadot-runtime-parachains",
"rustc-hex",
"scale-info",
@@ -6777,6 +6790,17 @@ dependencies = [
"xcm",
]
+[[package]]
+name = "polkadot-runtime-constants"
+version = "0.9.13"
+dependencies = [
+ "frame-support",
+ "polkadot-primitives",
+ "polkadot-runtime-common",
+ "smallvec",
+ "sp-runtime",
+]
+
[[package]]
name = "polkadot-runtime-parachains"
version = "0.9.13"
@@ -6835,6 +6859,7 @@ dependencies = [
"futures 0.3.18",
"hex-literal",
"kusama-runtime",
+ "kusama-runtime-constants",
"kvdb",
"kvdb-rocksdb",
"log",
@@ -6875,10 +6900,12 @@ dependencies = [
"polkadot-primitives",
"polkadot-rpc",
"polkadot-runtime",
+ "polkadot-runtime-constants",
"polkadot-runtime-parachains",
"polkadot-statement-distribution",
"polkadot-test-client",
"rococo-runtime",
+ "rococo-runtime-constants",
"sc-authority-discovery",
"sc-basic-authorship",
"sc-block-builder",
@@ -6922,6 +6949,7 @@ dependencies = [
"thiserror",
"tracing",
"westend-runtime",
+ "westend-runtime-constants",
]
[[package]]
@@ -7128,6 +7156,7 @@ dependencies = [
"sp-trie",
"sp-version",
"substrate-wasm-builder",
+ "test-runtime-constants",
"tiny-keccak",
"xcm",
"xcm-builder",
@@ -7184,6 +7213,7 @@ dependencies = [
"substrate-test-client",
"substrate-test-utils",
"tempfile",
+ "test-runtime-constants",
"tokio",
"tracing",
]
@@ -7712,14 +7742,17 @@ dependencies = [
"clap",
"frame-system",
"kusama-runtime",
+ "kusama-runtime-constants",
"log",
"pallet-bags-list-remote-tests",
"polkadot-runtime",
+ "polkadot-runtime-constants",
"sp-core",
"sp-tracing",
"structopt",
"tokio",
"westend-runtime",
+ "westend-runtime-constants",
]
[[package]]
@@ -7848,6 +7881,7 @@ dependencies = [
"polkadot-primitives",
"polkadot-runtime-common",
"polkadot-runtime-parachains",
+ "rococo-runtime-constants",
"scale-info",
"serde",
"serde_derive",
@@ -7872,6 +7906,17 @@ dependencies = [
"xcm-executor",
]
+[[package]]
+name = "rococo-runtime-constants"
+version = "0.9.13"
+dependencies = [
+ "frame-support",
+ "polkadot-primitives",
+ "polkadot-runtime-common",
+ "smallvec",
+ "sp-runtime",
+]
+
[[package]]
name = "rpassword"
version = "5.0.1"
@@ -10492,6 +10537,17 @@ dependencies = [
"tokio",
]
+[[package]]
+name = "test-runtime-constants"
+version = "0.9.13"
+dependencies = [
+ "frame-support",
+ "polkadot-primitives",
+ "polkadot-runtime-common",
+ "smallvec",
+ "sp-runtime",
+]
+
[[package]]
name = "textwrap"
version = "0.11.0"
@@ -11552,11 +11608,23 @@ dependencies = [
"sp-version",
"substrate-wasm-builder",
"tiny-keccak",
+ "westend-runtime-constants",
"xcm",
"xcm-builder",
"xcm-executor",
]
+[[package]]
+name = "westend-runtime-constants"
+version = "0.9.13"
+dependencies = [
+ "frame-support",
+ "polkadot-primitives",
+ "polkadot-runtime-common",
+ "smallvec",
+ "sp-runtime",
+]
+
[[package]]
name = "which"
version = "4.2.2"
diff --git a/polkadot/node/service/Cargo.toml b/polkadot/node/service/Cargo.toml
index ce571a9669754606dfa36e74610ebfa0c3a68bef..d80e3d5382cd4d40662ed665e0d965e24f1f2a82 100644
--- a/polkadot/node/service/Cargo.toml
+++ b/polkadot/node/service/Cargo.toml
@@ -84,6 +84,12 @@ polkadot-node-subsystem-util = { path = "../subsystem-util" }
polkadot-runtime-parachains = { path = "../../runtime/parachains" }
polkadot-node-network-protocol = { path = "../network/protocol" }
+# Polkadot Runtime Constants
+polkadot-runtime-constants = { path = "../../runtime/polkadot/constants", optional = true }
+kusama-runtime-constants = { path = "../../runtime/kusama/constants", optional = true }
+rococo-runtime-constants = { path = "../../runtime/rococo/constants", optional = true }
+westend-runtime-constants = { path = "../../runtime/westend/constants", optional = true }
+
# Polkadot Runtimes
polkadot-runtime = { path = "../../runtime/polkadot", optional = true }
kusama-runtime = { path = "../../runtime/kusama", optional = true }
@@ -154,10 +160,10 @@ full-node = [
# Configure the native runtimes to use. Polkadot is enabled by default.
#
# Validators require the native runtime currently
-polkadot-native = [ "polkadot-runtime", "polkadot-client/polkadot" ]
-kusama-native = [ "kusama-runtime", "polkadot-client/kusama" ]
-westend-native = [ "westend-runtime", "polkadot-client/westend" ]
-rococo-native = [ "rococo-runtime", "polkadot-client/rococo" ]
+polkadot-native = [ "polkadot-runtime", "polkadot-runtime-constants", "polkadot-client/polkadot" ]
+kusama-native = [ "kusama-runtime", "kusama-runtime-constants", "polkadot-client/kusama" ]
+westend-native = [ "westend-runtime", "westend-runtime-constants", "polkadot-client/westend" ]
+rococo-native = [ "rococo-runtime", "rococo-runtime-constants", "polkadot-client/rococo" ]
runtime-benchmarks = [
"polkadot-runtime/runtime-benchmarks",
diff --git a/polkadot/node/service/src/chain_spec.rs b/polkadot/node/service/src/chain_spec.rs
index 614acbd0d3150dba53b52ccc0bea8b9bc90a4c7f..19d82f0d084107917431033962af7ebcef76e1bd 100644
--- a/polkadot/node/service/src/chain_spec.rs
+++ b/polkadot/node/service/src/chain_spec.rs
@@ -21,21 +21,21 @@ use grandpa::AuthorityId as GrandpaId;
#[cfg(feature = "kusama-native")]
use kusama_runtime as kusama;
#[cfg(feature = "kusama-native")]
-use kusama_runtime::constants::currency::UNITS as KSM;
+use kusama_runtime_constants::currency::UNITS as KSM;
use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
use pallet_staking::Forcing;
-#[cfg(feature = "polkadot-native")]
-use polkadot::constants::currency::UNITS as DOT;
use polkadot_primitives::v1::{AccountId, AccountPublic, AssignmentId, ValidatorId};
#[cfg(feature = "polkadot-native")]
use polkadot_runtime as polkadot;
+#[cfg(feature = "polkadot-native")]
+use polkadot_runtime_constants::currency::UNITS as DOT;
use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
use sp_consensus_babe::AuthorityId as BabeId;
#[cfg(feature = "rococo-native")]
use rococo_runtime as rococo;
#[cfg(feature = "rococo-native")]
-use rococo_runtime::constants::currency::UNITS as ROC;
+use rococo_runtime_constants::currency::UNITS as ROC;
use sc_chain_spec::{ChainSpecExtension, ChainType};
use serde::{Deserialize, Serialize};
use sp_core::{sr25519, Pair, Public};
@@ -44,7 +44,7 @@ use telemetry::TelemetryEndpoints;
#[cfg(feature = "westend-native")]
use westend_runtime as westend;
#[cfg(feature = "westend-native")]
-use westend_runtime::constants::currency::UNITS as WND;
+use westend_runtime_constants::currency::UNITS as WND;
#[cfg(feature = "polkadot-native")]
const POLKADOT_STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
@@ -128,7 +128,7 @@ impl sp_runtime::BuildStorage for RococoGenesisExt {
fn assimilate_storage(&self, storage: &mut sp_core::storage::Storage) -> Result<(), String> {
sp_state_machine::BasicExternalities::execute_with_storage(storage, || {
if let Some(length) = self.session_length_in_blocks.as_ref() {
- rococo::constants::time::EpochDurationInBlocks::set(length);
+ rococo_runtime_constants::time::EpochDurationInBlocks::set(length);
}
});
self.runtime_genesis_config.assimilate_storage(storage)
diff --git a/polkadot/node/test/service/Cargo.toml b/polkadot/node/test/service/Cargo.toml
index 307a099e2b40f63a2749476d0e72d32876d9cdcd..ae950143f97692192a22ebc4e8ced5bafd6f5977 100644
--- a/polkadot/node/test/service/Cargo.toml
+++ b/polkadot/node/test/service/Cargo.toml
@@ -23,6 +23,7 @@ polkadot-service = { path = "../../service" }
polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-node-primitives = { path = "../../primitives" }
polkadot-test-runtime = { path = "../../../runtime/test-runtime" }
+test-runtime-constants = { path = "../../../runtime/test-runtime/constants" }
polkadot-runtime-parachains = { path = "../../../runtime/parachains" }
# Substrate dependencies
diff --git a/polkadot/node/test/service/src/chain_spec.rs b/polkadot/node/test/service/src/chain_spec.rs
index 06029c63f7671b342b965bba8af45e9c305919ab..5b1d7a3f97d188672a2fa85e4669894e71321192 100644
--- a/polkadot/node/test/service/src/chain_spec.rs
+++ b/polkadot/node/test/service/src/chain_spec.rs
@@ -21,11 +21,12 @@ use grandpa::AuthorityId as GrandpaId;
use pallet_staking::Forcing;
use polkadot_primitives::v1::{AccountId, AssignmentId, ValidatorId, MAX_CODE_SIZE, MAX_POV_SIZE};
use polkadot_service::chain_spec::{get_account_id_from_seed, get_from_seed, Extensions};
-use polkadot_test_runtime::{constants::currency::DOTS, BABE_GENESIS_EPOCH_CONFIG};
+use polkadot_test_runtime::BABE_GENESIS_EPOCH_CONFIG;
use sc_chain_spec::{ChainSpec, ChainType};
use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
use sp_core::sr25519;
use sp_runtime::Perbill;
+use test_runtime_constants::currency::DOTS;
const DEFAULT_PROTOCOL_ID: &str = "dot";
diff --git a/polkadot/runtime/kusama/Cargo.toml b/polkadot/runtime/kusama/Cargo.toml
index cf649e0f047c08816f50a9489eecc56015e37fda..eb66353bea72e8918180ea1d0d47cb518b6c69ac 100644
--- a/polkadot/runtime/kusama/Cargo.toml
+++ b/polkadot/runtime/kusama/Cargo.toml
@@ -19,6 +19,7 @@ smallvec = "1.6.1"
authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+kusama-runtime-constants = { package = "kusama-runtime-constants", path = "./constants", default-features = false }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -171,6 +172,7 @@ std = [
"frame-try-runtime/std",
"sp-npos-elections/std",
"beefy-primitives/std",
+ "kusama-runtime-constants/std",
"pallet-mmr-primitives/std",
"xcm/std",
"xcm-executor/std",
diff --git a/polkadot/runtime/kusama/constants/Cargo.toml b/polkadot/runtime/kusama/constants/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..1ef07a00594508005241147396a1b3d8941676b7
--- /dev/null
+++ b/polkadot/runtime/kusama/constants/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "kusama-runtime-constants"
+version = "0.9.13"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2021"
+
+[dependencies]
+smallvec = "1.6.1"
+
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+primitives = { package = "polkadot-primitives", path = "../../../primitives", default-features = false }
+runtime-common = { package = "polkadot-runtime-common", path = "../../common", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+
+[features]
+default = ["std"]
+std = [
+ "sp-runtime/std"
+]
diff --git a/polkadot/runtime/kusama/src/constants.rs b/polkadot/runtime/kusama/constants/src/lib.rs
similarity index 98%
rename from polkadot/runtime/kusama/src/constants.rs
rename to polkadot/runtime/kusama/constants/src/lib.rs
index fa653df2a398e97b7a0547a6d69d77914c7f91b4..80d14e69f9668827b828c97dd8e940466d2cfff9 100644
--- a/polkadot/runtime/kusama/src/constants.rs
+++ b/polkadot/runtime/kusama/constants/src/lib.rs
@@ -14,6 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
+#![cfg_attr(not(feature = "std"), no_std)]
/// Money matters.
pub mod currency {
use primitives::v0::Balance;
diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs
index b55e64a0f3cd4b8b1c8e53e5902c957a207ec861..2ce293f019a893d5f646901dadfd6a33c36a187a 100644
--- a/polkadot/runtime/kusama/src/lib.rs
+++ b/polkadot/runtime/kusama/src/lib.rs
@@ -98,8 +98,7 @@ pub use pallet_timestamp::Call as TimestampCall;
pub use sp_runtime::BuildStorage;
/// Constant values used within the runtime.
-pub mod constants;
-use constants::{currency::*, fee::*, time::*};
+use kusama_runtime_constants::{currency::*, fee::*, time::*};
// Weights used in the runtime.
mod weights;
diff --git a/polkadot/runtime/polkadot/Cargo.toml b/polkadot/runtime/polkadot/Cargo.toml
index 6413a72a0a3a490ecfe645ecf1998122ed192ac4..a48e57273816b8f0fae9ff44e695862400467ea0 100644
--- a/polkadot/runtime/polkadot/Cargo.toml
+++ b/polkadot/runtime/polkadot/Cargo.toml
@@ -63,6 +63,7 @@ pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "ma
pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" }
frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+polkadot-runtime-constants = { package = "polkadot-runtime-constants", path = "./constants", default-features = false }
pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -151,6 +152,7 @@ std = [
"sp-staking/std",
"frame-system/std",
"frame-system-rpc-runtime-api/std",
+ "polkadot-runtime-constants/std",
"sp-version/std",
"serde_derive",
"serde/std",
diff --git a/polkadot/runtime/polkadot/constants/Cargo.toml b/polkadot/runtime/polkadot/constants/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..42f4ebe95edb62f9705b3cf63ee0cafcb8643650
--- /dev/null
+++ b/polkadot/runtime/polkadot/constants/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "polkadot-runtime-constants"
+version = "0.9.13"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2021"
+
+[dependencies]
+smallvec = "1.6.1"
+
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+primitives = { package = "polkadot-primitives", path = "../../../primitives", default-features = false }
+runtime-common = { package = "polkadot-runtime-common", path = "../../common", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+
+[features]
+default = ["std"]
+std = [
+ "sp-runtime/std"
+]
diff --git a/polkadot/runtime/polkadot/src/constants.rs b/polkadot/runtime/polkadot/constants/src/lib.rs
similarity index 98%
rename from polkadot/runtime/polkadot/src/constants.rs
rename to polkadot/runtime/polkadot/constants/src/lib.rs
index 3b53a55d6990fb1325f0ab7d8b634670e8680d2b..e095ae543a6ffc1a887d4a1045ce904b5604bac0 100644
--- a/polkadot/runtime/polkadot/src/constants.rs
+++ b/polkadot/runtime/polkadot/constants/src/lib.rs
@@ -14,6 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
+#![cfg_attr(not(feature = "std"), no_std)]
+
+pub use self::currency::DOLLARS;
+
/// Money matters.
pub mod currency {
use primitives::v0::Balance;
diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs
index c434f3d5f01d7dba54249a27d1d931b73ad08d4c..1157171e753482c80f5a02f8ae1d6a0c9e34d854 100644
--- a/polkadot/runtime/polkadot/src/lib.rs
+++ b/polkadot/runtime/polkadot/src/lib.rs
@@ -100,8 +100,7 @@ pub use pallet_timestamp::Call as TimestampCall;
pub use sp_runtime::BuildStorage;
/// Constant values used within the runtime.
-pub mod constants;
-use constants::{currency::*, fee::*, time::*};
+use polkadot_runtime_constants::{currency::*, fee::*, time::*};
// Weights used in the runtime.
mod weights;
diff --git a/polkadot/runtime/rococo/Cargo.toml b/polkadot/runtime/rococo/Cargo.toml
index 1e583ff23b694ed25f22f0b70140b2526ae07597..854dc36296e740c0f5837b9b9c2bff42d03c0d75 100644
--- a/polkadot/runtime/rococo/Cargo.toml
+++ b/polkadot/runtime/rococo/Cargo.toml
@@ -58,6 +58,7 @@ authority-discovery-primitives = { package = "sp-authority-discovery", git = "ht
frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+rococo-runtime-constants = { package = "rococo-runtime-constants", path = "./constants", default-features = false }
runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
diff --git a/polkadot/runtime/rococo/constants/Cargo.toml b/polkadot/runtime/rococo/constants/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..553c67b694d7aa7fb80b959c22a802b3c122a56a
--- /dev/null
+++ b/polkadot/runtime/rococo/constants/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "rococo-runtime-constants"
+version = "0.9.13"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2021"
+
+[dependencies]
+smallvec = "1.6.1"
+
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+primitives = { package = "polkadot-primitives", path = "../../../primitives", default-features = false }
+runtime-common = { package = "polkadot-runtime-common", path = "../../common", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+
+[features]
+default = ["std"]
+std = [
+ "sp-runtime/std"
+]
diff --git a/polkadot/runtime/rococo/src/constants.rs b/polkadot/runtime/rococo/constants/src/lib.rs
similarity index 98%
rename from polkadot/runtime/rococo/src/constants.rs
rename to polkadot/runtime/rococo/constants/src/lib.rs
index cb69e2d867ed531112076c3f839ca16250950b20..e4b1e1fa6f4cbab01f17dad1185063363bba1ec8 100644
--- a/polkadot/runtime/rococo/src/constants.rs
+++ b/polkadot/runtime/rococo/constants/src/lib.rs
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
+#![cfg_attr(not(feature = "std"), no_std)]
+
/// Money matters.
pub mod currency {
use primitives::v0::Balance;
diff --git a/polkadot/runtime/rococo/src/bridge_messages.rs b/polkadot/runtime/rococo/src/bridge_messages.rs
index 31568f5c51bc67b734c34ee60d5a8e9f58cd36f7..725031e12eecc1cdbe59f16be875216585e57d73 100644
--- a/polkadot/runtime/rococo/src/bridge_messages.rs
+++ b/polkadot/runtime/rococo/src/bridge_messages.rs
@@ -39,6 +39,8 @@ use frame_support::{
};
use sp_std::{convert::TryFrom, marker::PhantomData, ops::RangeInclusive};
+use rococo_runtime_constants::fee::WeightToFee;
+
/// Maximal number of pending outbound messages.
const MAXIMAL_PENDING_MESSAGES_AT_OUTBOUND_LANE: MessageNonce =
bp_rococo::MAX_UNCONFIRMED_MESSAGES_AT_INBOUND_LANE;
@@ -138,7 +140,7 @@ impl<B, GI> ThisChainWithMessages for RococoLikeChain<B, GI> {
.base_extrinsic,
crate::TransactionByteFee::get(),
pallet_transaction_payment::Pallet::<crate::Runtime>::next_fee_multiplier(),
- |weight| crate::constants::fee::WeightToFee::calc(&weight),
+ |weight| WeightToFee::calc(&weight),
transaction,
)
}
@@ -195,7 +197,7 @@ impl<B, GI> BridgedChainWithMessages for RococoLikeChain<B, GI> {
.base_extrinsic,
crate::TransactionByteFee::get(),
pallet_transaction_payment::Pallet::<crate::Runtime>::next_fee_multiplier(),
- |weight| crate::constants::fee::WeightToFee::calc(&weight),
+ |weight| WeightToFee::calc(&weight),
transaction,
)
}
diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs
index e6d02769e050ec9b2c70a8373e13e3abfd8c2267..b2f0b88924cf9f8be453da919e198a2c40f38bca 100644
--- a/polkadot/runtime/rococo/src/lib.rs
+++ b/polkadot/runtime/rococo/src/lib.rs
@@ -81,7 +81,9 @@ pub use pallet_balances::Call as BalancesCall;
use polkadot_parachain::primitives::Id as ParaId;
-use constants::{currency::*, fee::*, time::*};
+/// Constant values used within the runtime.
+use rococo_runtime_constants::{currency::*, fee::*, time::*};
+
use frame_support::traits::{InstanceFilter, OnRuntimeUpgrade};
use xcm::latest::prelude::*;
use xcm_builder::{
@@ -93,8 +95,6 @@ use xcm_builder::{
use xcm_executor::XcmExecutor;
mod bridge_messages;
-/// Constant values used within the runtime.
-pub mod constants;
mod validator_manager;
mod weights;
diff --git a/polkadot/runtime/test-runtime/Cargo.toml b/polkadot/runtime/test-runtime/Cargo.toml
index 1c41ae40bed7f3415e6e31346c3007d448340029..f85c31fc82a5d8980f8e2de63a50bf28db7ec55e 100644
--- a/polkadot/runtime/test-runtime/Cargo.toml
+++ b/polkadot/runtime/test-runtime/Cargo.toml
@@ -50,6 +50,7 @@ pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "ma
pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" }
frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+test-runtime-constants = { package = "test-runtime-constants", path = "./constants", default-features = false }
pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -114,6 +115,7 @@ std = [
"pallet-staking/std",
"frame-system/std",
"frame-system-rpc-runtime-api/std",
+ "test-runtime-constants/std",
"pallet-timestamp/std",
"sp-version/std",
"pallet-vesting/std",
diff --git a/polkadot/runtime/test-runtime/constants/Cargo.toml b/polkadot/runtime/test-runtime/constants/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..88df1f86cc1bff08c4583be069b9355443953f21
--- /dev/null
+++ b/polkadot/runtime/test-runtime/constants/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "test-runtime-constants"
+version = "0.9.13"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2021"
+
+[dependencies]
+smallvec = "1.6.1"
+
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+primitives = { package = "polkadot-primitives", path = "../../../primitives", default-features = false }
+runtime-common = { package = "polkadot-runtime-common", path = "../../common", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+
+[features]
+default = ["std"]
+std = [
+ "sp-runtime/std"
+]
diff --git a/polkadot/runtime/test-runtime/src/constants.rs b/polkadot/runtime/test-runtime/constants/src/lib.rs
similarity index 98%
rename from polkadot/runtime/test-runtime/src/constants.rs
rename to polkadot/runtime/test-runtime/constants/src/lib.rs
index 3554363e900822f71cbe6b3a8d3e3ca8c8a497f4..331e3ab47cb850c131b34a8bccc06dd2eca41657 100644
--- a/polkadot/runtime/test-runtime/src/constants.rs
+++ b/polkadot/runtime/test-runtime/constants/src/lib.rs
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
+#![cfg_attr(not(feature = "std"), no_std)]
+
/// Money matters.
pub mod currency {
use primitives::v0::Balance;
diff --git a/polkadot/runtime/test-runtime/src/lib.rs b/polkadot/runtime/test-runtime/src/lib.rs
index 0df0c11c4f19bc325d41a352823be087a9f01453..958951b7c7d8368b6caa4e981e3aa22ac820f8a9 100644
--- a/polkadot/runtime/test-runtime/src/lib.rs
+++ b/polkadot/runtime/test-runtime/src/lib.rs
@@ -81,9 +81,8 @@ pub use paras_sudo_wrapper::Call as ParasSudoWrapperCall;
pub use sp_runtime::BuildStorage;
/// Constant values used within the runtime.
-pub mod constants;
+use test_runtime_constants::{currency::*, fee::*, time::*};
pub mod xcm_config;
-use constants::{currency::*, fee::*, time::*};
// Make the WASM binary available.
#[cfg(feature = "std")]
diff --git a/polkadot/runtime/westend/Cargo.toml b/polkadot/runtime/westend/Cargo.toml
index a34a792f4acae6d5010cae4cc8185ed0dfb4c08d..40e654ab47b4f9c3f8d7a405195b48856130ea7c 100644
--- a/polkadot/runtime/westend/Cargo.toml
+++ b/polkadot/runtime/westend/Cargo.toml
@@ -37,6 +37,7 @@ frame-executive = { git = "https://github.com/paritytech/substrate", branch = "m
frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+westend-runtime-constants = { package = "westend-runtime-constants", path = "./constants", default-features = false }
pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -157,6 +158,7 @@ std = [
"sp-staking/std",
"frame-system/std",
"frame-system-rpc-runtime-api/std",
+ "westend-runtime-constants/std",
"sp-version/std",
"serde_derive",
"serde/std",
diff --git a/polkadot/runtime/westend/constants/Cargo.toml b/polkadot/runtime/westend/constants/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..ead62809a00a219f1e8a8f8b7a2643476750f1d0
--- /dev/null
+++ b/polkadot/runtime/westend/constants/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "westend-runtime-constants"
+version = "0.9.13"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2021"
+
+[dependencies]
+smallvec = "1.6.1"
+
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+primitives = { package = "polkadot-primitives", path = "../../../primitives", default-features = false }
+runtime-common = { package = "polkadot-runtime-common", path = "../../common", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+
+[features]
+default = ["std"]
+std = [
+ "sp-runtime/std"
+]
diff --git a/polkadot/runtime/westend/src/constants.rs b/polkadot/runtime/westend/constants/src/lib.rs
similarity index 98%
rename from polkadot/runtime/westend/src/constants.rs
rename to polkadot/runtime/westend/constants/src/lib.rs
index a6eaba9e2063cccf66ec9ce6943797ff37093165..e7d709cabce0e4d1038e1f27b98c8c33f755f09e 100644
--- a/polkadot/runtime/westend/src/constants.rs
+++ b/polkadot/runtime/westend/constants/src/lib.rs
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
+#![cfg_attr(not(feature = "std"), no_std)]
+
/// Money matters.
pub mod currency {
use primitives::v0::Balance;
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index 24d31ca9a7452ae2bf36f5077552b4cd3b33fc19..5593324258a2000deff9028675930f6907128982 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -98,8 +98,7 @@ pub use pallet_timestamp::Call as TimestampCall;
pub use sp_runtime::BuildStorage;
/// Constant values used within the runtime.
-pub mod constants;
-use constants::{currency::*, fee::*, time::*};
+use westend_runtime_constants::{currency::*, fee::*, time::*};
// Weights used in the runtime
mod weights;
diff --git a/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml b/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml
index dc0917fed8a413614643f976f9af85ee1411f6ab..18b9d23d78d51ba73185cc928526b16cbff5dc01 100644
--- a/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml
+++ b/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml
@@ -5,9 +5,13 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
-polkadot-runtime = { version = "0.9.8", path = "../../../runtime/polkadot" }
-kusama-runtime = { version = "0.9.8", path = "../../../runtime/kusama" }
-westend-runtime = { version = "0.9.8", path = "../../../runtime/westend" }
+polkadot-runtime = { version = "0.9.13", path = "../../../runtime/polkadot" }
+kusama-runtime = { version = "0.9.13", path = "../../../runtime/kusama" }
+westend-runtime = { version = "0.9.13", path = "../../../runtime/westend" }
+polkadot-runtime-constants = { version = "0.9.13", path = "../../../runtime/polkadot/constants" }
+kusama-runtime-constants = { version = "0.9.13", path = "../../../runtime/kusama/constants" }
+westend-runtime-constants = { version = "0.9.13", path = "../../../runtime/westend/constants" }
+
pallet-bags-list-remote-tests = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/polkadot/utils/remote-ext-tests/bags-list/src/main.rs b/polkadot/utils/remote-ext-tests/bags-list/src/main.rs
index af51d5188862215ffef4a1880706b4b3afba7719..d01942694ebd5904fa76df2fbfa4e771e80fd8c0 100644
--- a/polkadot/utils/remote-ext-tests/bags-list/src/main.rs
+++ b/polkadot/utils/remote-ext-tests/bags-list/src/main.rs
@@ -83,15 +83,18 @@ async fn main() {
match (options.runtime, options.command) {
(Runtime::Kusama, Command::CheckMigration) => {
- use kusama_runtime::{constants::currency::UNITS, Block, Runtime};
+ use kusama_runtime::{Block, Runtime};
+ use kusama_runtime_constants::currency::UNITS;
migration::execute::<Runtime, Block>(UNITS as u64, "KSM", options.uri.clone()).await;
},
(Runtime::Kusama, Command::SanityCheck) => {
- use kusama_runtime::{constants::currency::UNITS, Block, Runtime};
+ use kusama_runtime::{Block, Runtime};
+ use kusama_runtime_constants::currency::UNITS;
sanity_check::execute::<Runtime, Block>(UNITS as u64, "KSM", options.uri.clone()).await;
},
(Runtime::Kusama, Command::Snapshot) => {
- use kusama_runtime::{constants::currency::UNITS, Block, Runtime};
+ use kusama_runtime::{Block, Runtime};
+ use kusama_runtime_constants::currency::UNITS;
snapshot::execute::<Runtime, Block>(
options.snapshot_limit,
UNITS.try_into().unwrap(),
@@ -101,15 +104,18 @@ async fn main() {
},
(Runtime::Westend, Command::CheckMigration) => {
- use westend_runtime::{constants::currency::UNITS, Block, Runtime};
+ use westend_runtime::{Block, Runtime};
+ use westend_runtime_constants::currency::UNITS;
migration::execute::<Runtime, Block>(UNITS as u64, "WND", options.uri.clone()).await;
},
(Runtime::Westend, Command::SanityCheck) => {
- use westend_runtime::{constants::currency::UNITS, Block, Runtime};
+ use westend_runtime::{Block, Runtime};
+ use westend_runtime_constants::currency::UNITS;
sanity_check::execute::<Runtime, Block>(UNITS as u64, "WND", options.uri.clone()).await;
},
(Runtime::Westend, Command::Snapshot) => {
- use westend_runtime::{constants::currency::UNITS, Block, Runtime};
+ use westend_runtime::{Block, Runtime};
+ use westend_runtime_constants::currency::UNITS;
snapshot::execute::<Runtime, Block>(
options.snapshot_limit,
UNITS.try_into().unwrap(),
@@ -119,15 +125,18 @@ async fn main() {
},
(Runtime::Polkadot, Command::CheckMigration) => {
- use polkadot_runtime::{constants::currency::UNITS, Block, Runtime};
+ use polkadot_runtime::{Block, Runtime};
+ use polkadot_runtime_constants::currency::UNITS;
migration::execute::<Runtime, Block>(UNITS as u64, "DOT", options.uri.clone()).await;
},
(Runtime::Polkadot, Command::SanityCheck) => {
- use polkadot_runtime::{constants::currency::UNITS, Block, Runtime};
+ use polkadot_runtime::{Block, Runtime};
+ use polkadot_runtime_constants::currency::UNITS;
sanity_check::execute::<Runtime, Block>(UNITS as u64, "DOT", options.uri.clone()).await;
},
(Runtime::Polkadot, Command::Snapshot) => {
- use polkadot_runtime::{constants::currency::UNITS, Block, Runtime};
+ use polkadot_runtime::{Block, Runtime};
+ use polkadot_runtime_constants::currency::UNITS;
snapshot::execute::<Runtime, Block>(
options.snapshot_limit,
UNITS.try_into().unwrap(),