[All] Split up manta_primitives lib.rs & [Manta&Calamari] Port parity's fast-runtime cargo feature

node/Cargo.toml

@@ -95,3 +95,7 @@ runtime-benchmarks = [
 	'polkadot-service/runtime-benchmarks',
 	'manta-runtime/runtime-benchmarks',
 ]
+fast-runtime = [
+	"manta-runtime/fast-runtime",
+	"calamari-runtime/fast-runtime",
+]

node/src/chain_specs/mod.rs

@@ -18,7 +18,7 @@
 #![allow(dead_code)]
 use cumulus_primitives_core::ParaId;
 use hex_literal::hex;
-use manta_primitives::{constants, AccountId, AuraId, Balance, Signature};
+use manta_primitives::{constants, types::{AccountId, AuraId, Balance, Signature}};
 use sc_chain_spec::{ChainSpecExtension, ChainSpecGroup};
 use sc_service::{ChainType, Properties};
 use serde::{Deserialize, Serialize};

node/src/command.rs

@@ -24,7 +24,7 @@ use codec::Encode;
 use cumulus_client_service::genesis::generate_genesis_block;
 use cumulus_primitives_core::ParaId;
 use log::info;
-use manta_primitives::Header;
+use manta_primitives::types::Header;
 use polkadot_parachain::primitives::AccountIdConversion;
 use sc_cli::{
 	ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,

node/src/rpc.rs

@@ -25,7 +25,7 @@ use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 
-use manta_primitives::{AccountId, Balance, Block, Index as Nonce};
+use manta_primitives::types::{AccountId, Balance, Block, Index as Nonce};
 
 /// A type representing all RPC extensions.
 pub type RpcExtension = jsonrpc_core::IoHandler<sc_rpc::Metadata>;

node/src/service.rs

@@ -31,7 +31,7 @@ use cumulus_primitives_core::{
 use polkadot_service::NativeExecutionDispatch;
 
 use crate::rpc;
-pub use manta_primitives::{AccountId, Balance, Block, Hash, Header, Index as Nonce};
+pub use manta_primitives::types::{AccountId, Balance, Block, Hash, Header, Index as Nonce};
 
 use cumulus_client_consensus_relay_chain::Verifier as RelayChainVerifier;
 use futures::lock::Mutex;

pallets/pallet-tx-pause/src/mock.rs

@@ -24,7 +24,7 @@
 use super::*;
 use frame_support::{construct_runtime, ord_parameter_types, parameter_types};
 use frame_system::EnsureRoot;
-use manta_primitives::Balance;
+use manta_primitives::types::Balance;
 
 use sp_core::H256;
 use sp_runtime::{testing::Header, traits::IdentityLookup};

runtime/calamari/Cargo.toml

@@ -121,6 +121,9 @@ runtime-benchmarks = [
 	'pallet-tx-pause/runtime-benchmarks',
 	'pallet-treasury/runtime-benchmarks',
 ]
+# Set timing constants (e.g. session period) to faster versions to speed up testing.
+fast-runtime = []
+
 std = [
 	'codec/std',
 	'serde',

runtime/calamari/src/currency.rs

@@ -15,7 +15,7 @@
 // along with Manta.  If not, see <http://www.gnu.org/licenses/>.
 
 #![allow(non_upper_case_globals)]
-use manta_primitives::Balance;
+use manta_primitives::types::Balance;
 
 pub const KMA: Balance = 1_000_000_000_000; // 12 decimal
 pub const cKMA: Balance = KMA / 100; // 10 decimal, cent-MA

runtime/calamari/src/fee.rs

@@ -17,7 +17,7 @@
 use frame_support::weights::{
 	WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial,
 };
-use manta_primitives::Balance;
+use manta_primitives::types::Balance;
 use smallvec::smallvec;
 pub use sp_runtime::Perbill;
 

runtime/calamari/src/lib.rs

@@ -52,7 +52,9 @@ use frame_system::{
 	EnsureOneOf, EnsureRoot,
 };
 use manta_primitives::{
-	time::*, AccountId, AuraId, Balance, BlockNumber, Hash, Header, Index, Signature,
+	constants::time::*,
+	prod_or_fast,
+	types::{AccountId, AuraId, Balance, BlockNumber, Hash, Header, Index, Signature},
 };
 use sp_runtime::{Perbill, Permill};
 
@@ -358,13 +360,13 @@ impl pallet_sudo::Config for Runtime {
 }
 
 parameter_types! {
-	pub const LaunchPeriod: BlockNumber = 7 * DAYS;
-	pub const VotingPeriod: BlockNumber = 7 * DAYS;
-	pub const FastTrackVotingPeriod: BlockNumber = 3 * HOURS;
+	pub LaunchPeriod: BlockNumber = prod_or_fast!(7 * DAYS, 5 * MINUTES,"CALAMARI_LAUNCHPERIOD");
+	pub VotingPeriod: BlockNumber = prod_or_fast!(7 * DAYS, 5 * MINUTES,"CALAMARI_VOTINGPERIOD");
+	pub FastTrackVotingPeriod: BlockNumber = prod_or_fast!(3 * HOURS, 2 * MINUTES,"CALAMARI_FASTTRACKVOTINGPERIOD");
 	pub const InstantAllowed: bool = true;
 	pub const MinimumDeposit: Balance = 20 * KMA;
-	pub const EnactmentPeriod: BlockNumber = 1 * DAYS;
-	pub const CooloffPeriod: BlockNumber = 7 * DAYS;
+	pub EnactmentPeriod: BlockNumber = prod_or_fast!(1 * DAYS, 2 * MINUTES,"CALAMARI_ENACTMENTPERIOD");
+	pub CooloffPeriod: BlockNumber = prod_or_fast!(7 * DAYS, 2 * MINUTES,"CALAMARI_COOLOFFPERIOD");
 	pub const PreimageByteDeposit: Balance = deposit(0, 1);
 	pub const MaxVotes: u32 = 100;
 	pub const MaxProposals: u32 = 100;
@@ -755,7 +757,7 @@ impl cumulus_pallet_dmp_queue::Config for Runtime {
 
 parameter_types! {
 	// Rotate collator's spot each 6 hours.
-	pub const Period: u32 = 6 * HOURS;
+	pub Period: u32 = prod_or_fast!(6 * HOURS, 2 * MINUTES,"CALAMARI_PERIOD");
 	pub const Offset: u32 = 0;
 	pub const MaxAuthorities: u32 = 100_000;
 }

runtime/manta/Cargo.toml

@@ -107,6 +107,9 @@ runtime-benchmarks = [
 	'pallet-scheduler/runtime-benchmarks',
 	'pallet-tx-pause/runtime-benchmarks',
 ]
+# Set timing constants (e.g. session period) to faster versions to speed up testing.
+fast-runtime = []
+
 std = [
 	'codec/std',
 	'serde',

runtime/manta/src/currency.rs

@@ -15,7 +15,7 @@
 // along with Manta.  If not, see <http://www.gnu.org/licenses/>.
 
 #![allow(non_upper_case_globals)]
-use manta_primitives::Balance;
+use manta_primitives::types::Balance;
 
 pub const MANTA: Balance = 1_000_000_000_000_000_000; // 18 decimal
 pub const cMANTA: Balance = MANTA / 100; // 16 decimal, cent-MA

runtime/manta/src/fee.rs

@@ -19,7 +19,7 @@ use frame_support::weights::{
 	constants::ExtrinsicBaseWeight, WeightToFeeCoefficient, WeightToFeeCoefficients,
 	WeightToFeePolynomial,
 };
-use manta_primitives::Balance;
+use manta_primitives::types::Balance;
 use smallvec::smallvec;
 pub use sp_runtime::Perbill;
 

runtime/manta/src/lib.rs

@@ -51,7 +51,9 @@ use frame_system::{
 	EnsureOneOf, EnsureRoot,
 };
 use manta_primitives::{
-	time::*, AccountId, AuraId, Balance, BlockNumber, Hash, Header, Index, Signature,
+	constants::time::*,
+	prod_or_fast,
+	types::{AccountId, AuraId, Balance, BlockNumber, Hash, Header, Index, Signature},
 };
 use sp_runtime::Perbill;
 
@@ -509,7 +511,7 @@ impl cumulus_pallet_dmp_queue::Config for Runtime {
 }
 
 parameter_types! {
-	pub const Period: u32 = 6 * HOURS;
+	pub Period: u32 = prod_or_fast!(7 * HOURS, 2 * MINUTES, "MANTA_PERIOD");
 	pub const Offset: u32 = 0;
 	pub const MaxAuthorities: u32 = 100_000;
 }

runtime/primitives/src/constants.rs

@@ -26,7 +26,7 @@ pub const MANTA_TOKEN_SYMBOL: &str = "MANTA";
 
 /// Manta parachain time-related
 pub mod time {
-	use crate::{BlockNumber, Moment};
+	use crate::types::{BlockNumber, Moment};
 	/// This determines the average expected block time that we are targeting. Blocks will be
 	/// produced at a minimum duration defined by `SLOT_DURATION`. `SLOT_DURATION` is picked up by
 	/// `pallet_timestamp` which is in turn picked up by `pallet_aura` to implement `fn

runtime/primitives/src/lib.rs

@@ -1,61 +1,40 @@
-// Copyright 2020-2022 Manta Network.
-// This file is part of Manta.
-//
-// Manta is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Manta is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Manta.  If not, see <http://www.gnu.org/licenses/>.
-
 #![allow(non_upper_case_globals)]
 #![allow(clippy::unnecessary_cast)]
 #![allow(clippy::upper_case_acronyms)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
 pub mod constants;
-pub use constants::time;
-
-use sp_runtime::traits::{BlakeTwo256, IdentifyAccount, Verify};
-
-/// An index to a block.
-pub type BlockNumber = u32;
-
-/// Alias to 512-bit hash when used in the context of a transaction signature on the chain.
-pub type Signature = sp_runtime::MultiSignature;
-
-/// Some way of identifying an account on the chain. We intentionally make it equivalent
-/// to the public key of our transaction signing scheme.
-pub type AccountId = <<Signature as Verify>::Signer as IdentifyAccount>::AccountId;
-
-/// The type for looking up accounts. We don't expect more than 4 billion of them, but you
-/// never know...
-pub type AccountIndex = u32;
-
-/// Balance of an account.
-pub type Balance = u128;
-
-/// Index of a transaction in the chain.
-pub type Index = u32;
-
-/// A hash of some data used by the chain.
-pub type Hash = sp_core::H256;
-
-/// Block header type as expected by this runtime.
-pub type Header = sp_runtime::generic::Header<BlockNumber, BlakeTwo256>;
-pub type Block = sp_runtime::generic::Block<Header, sp_runtime::OpaqueExtrinsic>;
-
-/// Digest item type.
-pub type DigestItem = sp_runtime::generic::DigestItem;
-
-// Aura consensus authority.
-pub type AuraId = sp_consensus_aura::sr25519::AuthorityId;
-
-// Moment
-pub type Moment = u64;
+pub mod types;
+
+// From https://github.com/paritytech/polkadot/pull/4332/files?diff=unified&w=1 @ runtime/common/src/lib.rs
+/// Macro to set a value (e.g. when using the `parameter_types` macro) to either a production value
+/// or to an environment variable or testing value (in case the `fast-runtime` feature is selected).
+/// Note that the environment variable is evaluated _at compile time_.
+///
+/// Usage:
+/// ```Rust
+/// parameter_types! {
+/// 	// Note that the env variable version parameter cannot be const.
+/// 	pub LaunchPeriod: BlockNumber = prod_or_fast!(7 * DAYS, 1, "KSM_LAUNCH_PERIOD");
+/// 	pub const VotingPeriod: BlockNumber = prod_or_fast!(7 * DAYS, 1 * MINUTES);
+/// }
+#[macro_export]
+macro_rules! prod_or_fast {
+	($prod:expr, $test:expr) => {
+		if cfg!(feature = "fast-runtime") {
+			$test
+		} else {
+			$prod
+		}
+	};
+	($prod:expr, $test:expr, $env:expr) => {
+		if cfg!(feature = "fast-runtime") {
+			core::option_env!($env)
+				.map(|s| s.parse().ok())
+				.flatten()
+				.unwrap_or($test)
+		} else {
+			$prod
+		}
+	};
+}

runtime/primitives/src/types.rs

@@ -0,0 +1,53 @@
+// Copyright 2020-2022 Manta Network.
+// This file is part of Manta.
+//
+// Manta is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Manta is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Manta.  If not, see <http://www.gnu.org/licenses/>.
+
+use sp_runtime::traits::{BlakeTwo256, IdentifyAccount, Verify};
+
+/// An index to a block.
+pub type BlockNumber = u32;
+
+/// Alias to 512-bit hash when used in the context of a transaction signature on the chain.
+pub type Signature = sp_runtime::MultiSignature;
+
+/// Some way of identifying an account on the chain. We intentionally make it equivalent
+/// to the public key of our transaction signing scheme.
+pub type AccountId = <<Signature as Verify>::Signer as IdentifyAccount>::AccountId;
+
+/// The type for looking up accounts. We don't expect more than 4 billion of them, but you
+/// never know...
+pub type AccountIndex = u32;
+
+/// Balance of an account.
+pub type Balance = u128;
+
+/// Index of a transaction in the chain.
+pub type Index = u32;
+
+/// A hash of some data used by the chain.
+pub type Hash = sp_core::H256;
+
+/// Block header type as expected by this runtime.
+pub type Header = sp_runtime::generic::Header<BlockNumber, BlakeTwo256>;
+pub type Block = sp_runtime::generic::Block<Header, sp_runtime::OpaqueExtrinsic>;
+
+/// Digest item type.
+pub type DigestItem = sp_runtime::generic::DigestItem;
+
+// Aura consensus authority.
+pub type AuraId = sp_consensus_aura::sr25519::AuthorityId;
+
+// Moment
+pub type Moment = u64;