From 849b5117f96957715e4b9adf658a29b201044d1b Mon Sep 17 00:00:00 2001
From: Joshy Orndorff <JoshOrndorff@users.noreply.github.com>
Date: Mon, 12 Apr 2021 10:40:44 -0400
Subject: [PATCH] rename EPOCH_DURATION_IN_BLOCKS -> EPOCH_DURATION_IN_SLOTS
(#2674)
---
polkadot/runtime/kusama/src/constants.rs | 6 +++---
polkadot/runtime/kusama/src/lib.rs | 4 ++--
polkadot/runtime/polkadot/src/constants.rs | 2 +-
polkadot/runtime/polkadot/src/lib.rs | 4 ++--
polkadot/runtime/test-runtime/src/constants.rs | 2 +-
polkadot/runtime/test-runtime/src/lib.rs | 2 +-
polkadot/runtime/westend/src/constants.rs | 2 +-
polkadot/runtime/westend/src/lib.rs | 4 ++--
8 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/polkadot/runtime/kusama/src/constants.rs b/polkadot/runtime/kusama/src/constants.rs
index 6b60cb1c9aa..13efedea0be 100644
--- a/polkadot/runtime/kusama/src/constants.rs
+++ b/polkadot/runtime/kusama/src/constants.rs
@@ -37,11 +37,11 @@ pub mod time {
// pub const MILLISECS_PER_BLOCK: Moment = 1000;
pub const SLOT_DURATION: Moment = MILLISECS_PER_BLOCK;
// Kusama
- pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = 1 * HOURS;
+ pub const EPOCH_DURATION_IN_SLOTS: BlockNumber = 1 * HOURS;
// Mainnet
-// pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = 4 * HOURS;
+// pub const EPOCH_DURATION_IN_SLOTS: BlockNumber = 4 * HOURS;
// Testnet
-// pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = 10 * MINUTES;
+// pub const EPOCH_DURATION_IN_SLOTS: BlockNumber = 10 * MINUTES;
// These time units are defined in number of blocks.
pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);
diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs
index a31683d81d4..a931677000f 100644
--- a/polkadot/runtime/kusama/src/lib.rs
+++ b/polkadot/runtime/kusama/src/lib.rs
@@ -180,7 +180,7 @@ impl pallet_scheduler::Config for Runtime {
}
parameter_types! {
- pub const EpochDuration: u64 = EPOCH_DURATION_IN_BLOCKS as u64;
+ pub const EpochDuration: u64 = EPOCH_DURATION_IN_SLOTS as u64;
pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK;
pub const ReportLongevity: u64 =
BondingDuration::get() as u64 * SessionsPerEra::get() as u64 * EpochDuration::get();
@@ -311,7 +311,7 @@ impl pallet_session::historical::Config for Runtime {
parameter_types! {
// no signed phase for now, just unsigned.
pub const SignedPhase: u32 = 0;
- pub const UnsignedPhase: u32 = EPOCH_DURATION_IN_BLOCKS / 4;
+ pub const UnsignedPhase: u32 = EPOCH_DURATION_IN_SLOTS / 4;
// fallback: run election on-chain.
pub const Fallback: pallet_election_provider_multi_phase::FallbackStrategy =
diff --git a/polkadot/runtime/polkadot/src/constants.rs b/polkadot/runtime/polkadot/src/constants.rs
index 6b72b7e9210..27a674fe9b4 100644
--- a/polkadot/runtime/polkadot/src/constants.rs
+++ b/polkadot/runtime/polkadot/src/constants.rs
@@ -33,7 +33,7 @@ pub mod time {
use primitives::v0::{Moment, BlockNumber};
pub const MILLISECS_PER_BLOCK: Moment = 6000;
pub const SLOT_DURATION: Moment = MILLISECS_PER_BLOCK;
- pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = 4 * HOURS;
+ pub const EPOCH_DURATION_IN_SLOTS: BlockNumber = 4 * HOURS;
// These time units are defined in number of blocks.
pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);
diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs
index e2967b77898..5b0665e9bf4 100644
--- a/polkadot/runtime/polkadot/src/lib.rs
+++ b/polkadot/runtime/polkadot/src/lib.rs
@@ -194,7 +194,7 @@ impl pallet_scheduler::Config for Runtime {
}
parameter_types! {
- pub const EpochDuration: u64 = EPOCH_DURATION_IN_BLOCKS as u64;
+ pub const EpochDuration: u64 = EPOCH_DURATION_IN_SLOTS as u64;
pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK;
pub const ReportLongevity: u64 =
BondingDuration::get() as u64 * SessionsPerEra::get() as u64 * EpochDuration::get();
@@ -321,7 +321,7 @@ impl pallet_session::historical::Config for Runtime {
parameter_types! {
// no signed phase for now, just unsigned.
pub const SignedPhase: u32 = 0;
- pub const UnsignedPhase: u32 = EPOCH_DURATION_IN_BLOCKS / 4;
+ pub const UnsignedPhase: u32 = EPOCH_DURATION_IN_SLOTS / 4;
// fallback: run election on-chain.
pub const Fallback: pallet_election_provider_multi_phase::FallbackStrategy =
diff --git a/polkadot/runtime/test-runtime/src/constants.rs b/polkadot/runtime/test-runtime/src/constants.rs
index 0d9a4fa088e..658a4bdca7a 100644
--- a/polkadot/runtime/test-runtime/src/constants.rs
+++ b/polkadot/runtime/test-runtime/src/constants.rs
@@ -31,7 +31,7 @@ pub mod time {
pub const MILLISECS_PER_BLOCK: Moment = 6000;
pub const SLOT_DURATION: Moment = MILLISECS_PER_BLOCK;
// 30 seconds for now
- pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = MINUTES / 2;
+ pub const EPOCH_DURATION_IN_SLOTS: BlockNumber = MINUTES / 2;
// These time units are defined in number of blocks.
pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);
diff --git a/polkadot/runtime/test-runtime/src/lib.rs b/polkadot/runtime/test-runtime/src/lib.rs
index fd5253fe21f..2a0cc386af5 100644
--- a/polkadot/runtime/test-runtime/src/lib.rs
+++ b/polkadot/runtime/test-runtime/src/lib.rs
@@ -162,7 +162,7 @@ impl<C> frame_system::offchain::SendTransactionTypes<C> for Runtime where
}
parameter_types! {
- pub storage EpochDuration: u64 = EPOCH_DURATION_IN_BLOCKS as u64;
+ pub storage EpochDuration: u64 = EPOCH_DURATION_IN_SLOTS as u64;
pub storage ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK;
}
diff --git a/polkadot/runtime/westend/src/constants.rs b/polkadot/runtime/westend/src/constants.rs
index b897299ed45..08eaa8dcb45 100644
--- a/polkadot/runtime/westend/src/constants.rs
+++ b/polkadot/runtime/westend/src/constants.rs
@@ -33,7 +33,7 @@ pub mod time {
use primitives::v0::{Moment, BlockNumber};
pub const MILLISECS_PER_BLOCK: Moment = 6000;
pub const SLOT_DURATION: Moment = MILLISECS_PER_BLOCK;
- pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = 1 * HOURS;
+ pub const EPOCH_DURATION_IN_SLOTS: BlockNumber = 1 * HOURS;
// These time units are defined in number of blocks.
pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index a272abe0508..18f605fdf31 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -172,7 +172,7 @@ impl pallet_scheduler::Config for Runtime {
}
parameter_types! {
- pub const EpochDuration: u64 = EPOCH_DURATION_IN_BLOCKS as u64;
+ pub const EpochDuration: u64 = EPOCH_DURATION_IN_SLOTS as u64;
pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK;
pub const ReportLongevity: u64 =
BondingDuration::get() as u64 * SessionsPerEra::get() as u64 * EpochDuration::get();
@@ -337,7 +337,7 @@ impl pallet_session::historical::Config for Runtime {
parameter_types! {
// no signed phase for now, just unsigned.
pub const SignedPhase: u32 = 0;
- pub const UnsignedPhase: u32 = EPOCH_DURATION_IN_BLOCKS / 4;
+ pub const UnsignedPhase: u32 = EPOCH_DURATION_IN_SLOTS / 4;
// fallback: run election on-chain.
pub const Fallback: pallet_election_provider_multi_phase::FallbackStrategy =
--
GitLab