Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Fix session phase in early-exit #453

Merged
gavofyork merged 6 commits into from
Jul 31, 2018
Merged

Fix session phase in early-exit #453

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
82bf203
Fix up session phase.
gavofyork Jul 29, 2018
4d4ef21
Merge branch 'master' of github.com:paritytech/polkadot
gavofyork Jul 29, 2018
999680a
Version bump
gavofyork Jul 29, 2018
f05d205
Fix session rotation properly and add test
gavofyork Jul 30, 2018
03cad51
Update runtimes
gavofyork Jul 31, 2018
7d3dd9c
Docs
gavofyork Jul 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion polkadot/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: ver_str!("polkadot"),
impl_name: ver_str!("parity-polkadot"),
authoring_version: 1,
spec_version: 2,
spec_version: 100,
impl_version: 0,
};

Expand Down
9 changes: 7 additions & 2 deletions substrate/runtime/session/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,14 @@ impl<T: Trait> Module<T> {
<CurrentStart<T>>::put(now);

// Enact era length change.
if let Some(next_len) = <NextSessionLength<T>>::take() {
let block_number = <system::Module<T>>::block_number();
let len_changed = if let Some(next_len) = <NextSessionLength<T>>::take() {
<SessionLength<T>>::put(next_len);
true
} else {
false
};
if len_changed || !normal_rotation {
let block_number = <system::Module<T>>::block_number();
<LastLengthChange<T>>::put(block_number);
}

Expand Down