Use Polkadot Constants instead of Hardcoding

pallets/dmp-queue/src/lib.rs

@@ -307,7 +307,7 @@ pub mod pallet {
 									id, remaining, required,
 								));
 							}
-						},
+						}
 					}
 				}
 				// Cannot be an `else` here since the `maybe_enqueue_page` may have changed.

pallets/xcmp-queue/src/lib.rs

@@ -516,15 +516,15 @@ impl<T: Config> Pallet<T> {
 								let index = Self::stash_overweight(sender, sent_at, overweight_xcm);
 								let e = Event::OverweightEnqueued(sender, sent_at, index, required);
 								Self::deposit_event(e);
-							},
+							}
 							Err(XcmError::WeightLimitReached(required))
 								if required <= max_weight =>
 							{
 								// That message didn't get processed this time because of being
 								// too heavy. We leave it around for next time and bail.
 								remaining_fragments = last_remaining_fragments;
 								break
-							},
+							}
 							Err(_) => {
 								// Message looks invalid; don't attempt to retry
 							},

polkadot-parachains/statemine/Cargo.toml

@@ -68,6 +68,7 @@ parachains-common = { path = "../parachains-common", 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" }
+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" }
 xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }

polkadot-parachains/statemine/src/constants.rs

@@ -14,19 +14,20 @@
 // limitations under the License.
 
 pub mod currency {
+	use kusama_runtime_constants as constants;
 	use node_primitives::Balance;
 
 	/// The existential deposit. Set to 1/10 of its parent Relay Chain (v9020).
-	pub const EXISTENTIAL_DEPOSIT: Balance = CENTS / 10;
+	pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
 
-	pub const UNITS: Balance = 1_000_000_000_000;
-	pub const CENTS: Balance = UNITS / 30_000;
-	pub const GRAND: Balance = CENTS * 100_000;
-	pub const MILLICENTS: Balance = CENTS / 1_000;
+	pub const UNITS: Balance = constants::currency::UNITS;
+	pub const CENTS: Balance = constants::currency::CENTS;
+	pub const GRAND: Balance = constants::currency::GRAND;
+	pub const MILLICENTS: Balance = constants::currency::MILLICENTS;
 
 	pub const fn deposit(items: u32, bytes: u32) -> Balance {
 		// map to 1/10 of what the kusama relay chain charges (v9020)
-		(items as Balance * 2_000 * CENTS + (bytes as Balance) * 100 * MILLICENTS) / 10
+		constants::currency::deposit(items, bytes) / 10
 	}
 }
 

polkadot-parachains/statemint/Cargo.toml

@@ -68,6 +68,7 @@ parachains-common = { path = "../parachains-common", 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-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" }
 xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }

polkadot-parachains/statemint/src/constants.rs

@@ -15,18 +15,19 @@
 
 pub mod currency {
 	use node_primitives::Balance;
+	use polkadot_runtime_constants as constants;
 
 	/// The existential deposit. Set to 1/10 of its parent Relay Chain (v9010).
-	pub const EXISTENTIAL_DEPOSIT: Balance = 10 * CENTS;
+	pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
 
-	pub const UNITS: Balance = 10_000_000_000;
-	pub const DOLLARS: Balance = UNITS;
-	pub const CENTS: Balance = UNITS / 100; // 100_000_000
-	pub const MILLICENTS: Balance = CENTS / 1_000; // 100_000
+	pub const UNITS: Balance = constants::currency::UNITS;
+	pub const DOLLARS: Balance = constants::currency::DOLLARS;
+	pub const CENTS: Balance = constants::currency::CENTS;
+	pub const MILLICENTS: Balance = constants::currency::MILLICENTS;
 
 	pub const fn deposit(items: u32, bytes: u32) -> Balance {
 		// 1/10 of Polkadot v9010
-		(items as Balance * 20 * DOLLARS + (bytes as Balance) * 100 * MILLICENTS) / 10
+		constants::currency::deposit(items, bytes) / 10
 	}
 }
 

polkadot-parachains/westmint/Cargo.toml

@@ -68,6 +68,7 @@ parachains-common = { path = "../parachains-common", 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" }
+westend-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" }
 xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }

polkadot-parachains/westmint/src/constants.rs

@@ -15,18 +15,19 @@
 
 pub mod currency {
 	use node_primitives::Balance;
+	use westend_runtime_constants as constants;
 
 	/// The existential deposit. Set to 1/10 of its parent Relay Chain.
-	pub const EXISTENTIAL_DEPOSIT: Balance = 100 * MILLICENTS;
+	pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
 
-	pub const UNITS: Balance = 1_000_000_000_000;
-	pub const CENTS: Balance = UNITS / 100;
-	pub const MILLICENTS: Balance = CENTS / 1_000;
-	pub const GRAND: Balance = CENTS * 100_000;
+	pub const UNITS: Balance = constants::currency::UNITS;
+	pub const CENTS: Balance = constants::currency::CENTS;
+	pub const MILLICENTS: Balance = constants::currency::MILLICENTS;
+	pub const GRAND: Balance = constants::currency::GRAND;
 
 	pub const fn deposit(items: u32, bytes: u32) -> Balance {
 		// 1/10 of Westend testnet
-		(items as Balance * 100 * CENTS + (bytes as Balance) * 5 * MILLICENTS) / 10
+		constants::currency::deposit(items, bytes) / 10
 	}
 }