pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 07:01:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert all UK spelling to US (#2138)

Browse Source 
* all the ise

* forgot a misspelling

* a few more replacements

* bump impl

* rollback and fixes

* bump impl again

* Add aliases for RPC

* Update on_demand.rs
This commit is contained in:
joe petrowski
2019-03-29 14:11:45 +01:00
committed by Gav Wood
parent a10e86ba5a
commit 0ddcbf747f
74 changed files with 453 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/srml/grandpa/src/lib.rs
+5 -5
View File
@@ -73,7 +73,7 @@ pub trait GrandpaChangeSignal<N> {
#[cfg_attr(feature = "std", derive(Serialize, Debug))]
#[derive(Encode, Decode, PartialEq, Eq, Clone)]
pub enum RawLog<N, SessionKey> {
/// Authorities set change has been signalled. Contains the new set of authorities
/// Authorities set change has been signaled. Contains the new set of authorities
/// and the delay in blocks _to finalize_ before applying.
AuthoritiesChangeSignal(N, Vec<(SessionKey, u64)>),
/// A forced authorities set change. Contains in this order: the median last
@@ -185,7 +185,7 @@ decl_event!(
decl_storage! {
trait Store for Module<T: Trait> as GrandpaFinality {
// Pending change: (signalled at, scheduled change).
// Pending change: (signaled at, scheduled change).
PendingChange get(pending_change): Option<StoredPendingChange<T::BlockNumber, T::SessionKey>>;
// next block number where we can force a change.
NextForced get(next_forced): Option<T::BlockNumber>;
@@ -215,13 +215,13 @@ decl_module! {
pub struct Module<T: Trait> for enum Call where origin: T::Origin {
fn deposit_event<T>() = default;
/// Report some misbehaviour.
/// Report some misbehavior.
fn report_misbehavior(origin, _report: Vec<u8>) {
ensure_signed(origin)?;
// FIXME: https://github.com/paritytech/substrate/issues/1112
}
fn on_finalise(block_number: T::BlockNumber) {
fn on_finalize(block_number: T::BlockNumber) {
if let Some(pending_change) = <PendingChange<T>>::get() {
if block_number == pending_change.scheduled_at {
if let Some(median) = pending_change.forced {
@@ -268,7 +268,7 @@ impl<T: Trait> Module<T> {
/// indicates the median last finalized block number and it should be used
/// as the canon block when starting the new grandpa voter.
///
/// No change should be signalled while any change is pending. Returns
/// No change should be signaled while any change is pending. Returns
/// an error if a change is already pending.
pub fn schedule_change(
next_authorities: Vec<(T::SessionKey, u64)>,
substrate/srml/grandpa/src/tests.rs
+37 -37
View File
@@ -18,7 +18,7 @@
#![cfg(test)]
use primitives::{testing, traits::OnFinalise};
use primitives::{testing, traits::OnFinalize};
use primitives::traits::Header;
use runtime_io::with_externalities;
use crate::mock::{Grandpa, System, new_test_ext};
@@ -30,13 +30,13 @@ use super::*;
#[test]
fn authorities_change_logged() {
with_externalities(&mut new_test_ext(vec![(1, 1), (2, 1), (3, 1)]), || {
System::initialise(&1, &Default::default(), &Default::default());
System::initialize(&1, &Default::default(), &Default::default());
Grandpa::schedule_change(vec![(4, 1), (5, 1), (6, 1)], 0, None).unwrap();
System::note_finished_extrinsics();
Grandpa::on_finalise(1);
Grandpa::on_finalize(1);
let header = System::finalise();
let header = System::finalize();
assert_eq!(header.digest, testing::Digest {
logs: vec![
RawLog::AuthoritiesChangeSignal(0, vec![(4, 1), (5, 1), (6, 1)]).into(),
@@ -55,10 +55,10 @@ fn authorities_change_logged() {
#[test]
fn authorities_change_logged_after_delay() {
with_externalities(&mut new_test_ext(vec![(1, 1), (2, 1), (3, 1)]), || {
System::initialise(&1, &Default::default(), &Default::default());
System::initialize(&1, &Default::default(), &Default::default());
Grandpa::schedule_change(vec![(4, 1), (5, 1), (6, 1)], 1, None).unwrap();
Grandpa::on_finalise(1);
let header = System::finalise();
Grandpa::on_finalize(1);
let header = System::finalize();
assert_eq!(header.digest, testing::Digest {
logs: vec![
RawLog::AuthoritiesChangeSignal(1, vec![(4, 1), (5, 1), (6, 1)]).into(),
@@ -68,11 +68,11 @@ fn authorities_change_logged_after_delay() {
// no change at this height.
assert_eq!(System::events(), vec![]);
System::initialise(&2, &header.hash(), &Default::default());
System::initialize(&2, &header.hash(), &Default::default());
System::note_finished_extrinsics();
Grandpa::on_finalise(2);
Grandpa::on_finalize(2);
let _header = System::finalise();
let _header = System::finalize();
assert_eq!(System::events(), vec![
EventRecord {
phase: Phase::Finalization,
@@ -85,27 +85,27 @@ fn authorities_change_logged_after_delay() {
#[test]
fn cannot_schedule_change_when_one_pending() {
with_externalities(&mut new_test_ext(vec![(1, 1), (2, 1), (3, 1)]), || {
System::initialise(&1, &Default::default(), &Default::default());
System::initialize(&1, &Default::default(), &Default::default());
Grandpa::schedule_change(vec![(4, 1), (5, 1), (6, 1)], 1, None).unwrap();
assert!(Grandpa::pending_change().is_some());
assert!(Grandpa::schedule_change(vec![(5, 1)], 1, None).is_err());
Grandpa::on_finalise(1);
let header = System::finalise();
Grandpa::on_finalize(1);
let header = System::finalize();
System::initialise(&2, &header.hash(), &Default::default());
System::initialize(&2, &header.hash(), &Default::default());
assert!(Grandpa::pending_change().is_some());
assert!(Grandpa::schedule_change(vec![(5, 1)], 1, None).is_err());
Grandpa::on_finalise(2);
let header = System::finalise();
Grandpa::on_finalize(2);
let header = System::finalize();
System::initialise(&3, &header.hash(), &Default::default());
System::initialize(&3, &header.hash(), &Default::default());
assert!(Grandpa::pending_change().is_none());
assert!(Grandpa::schedule_change(vec![(5, 1)], 1, None).is_ok());
Grandpa::on_finalise(3);
let _header = System::finalise();
Grandpa::on_finalize(3);
let _header = System::finalize();
});
}
@@ -128,7 +128,7 @@ fn new_decodes_from_old() {
#[test]
fn dispatch_forced_change() {
with_externalities(&mut new_test_ext(vec![(1, 1), (2, 1), (3, 1)]), || {
System::initialise(&1, &Default::default(), &Default::default());
System::initialize(&1, &Default::default(), &Default::default());
Grandpa::schedule_change(
vec![(4, 1), (5, 1), (6, 1)],
5,
@@ -138,60 +138,60 @@ fn dispatch_forced_change() {
assert!(Grandpa::pending_change().is_some());
assert!(Grandpa::schedule_change(vec![(5, 1)], 1, Some(0)).is_err());
Grandpa::on_finalise(1);
let mut header = System::finalise();
Grandpa::on_finalize(1);
let mut header = System::finalize();
for i in 2..7 {
System::initialise(&i, &header.hash(), &Default::default());
System::initialize(&i, &header.hash(), &Default::default());
assert!(Grandpa::pending_change().unwrap().forced.is_some());
assert_eq!(Grandpa::next_forced(), Some(11));
assert!(Grandpa::schedule_change(vec![(5, 1)], 1, None).is_err());
assert!(Grandpa::schedule_change(vec![(5, 1)], 1, Some(0)).is_err());
Grandpa::on_finalise(i);
header = System::finalise();
Grandpa::on_finalize(i);
header = System::finalize();
}
// change has been applied at the end of block 6.
// add a normal change.
{
System::initialise(&7, &header.hash(), &Default::default());
System::initialize(&7, &header.hash(), &Default::default());
assert!(Grandpa::pending_change().is_none());
assert_eq!(Grandpa::grandpa_authorities(), vec![(4, 1), (5, 1), (6, 1)]);
assert!(Grandpa::schedule_change(vec![(5, 1)], 1, None).is_ok());
Grandpa::on_finalise(7);
header = System::finalise();
Grandpa::on_finalize(7);
header = System::finalize();
}
// run the normal change.
{
System::initialise(&8, &header.hash(), &Default::default());
System::initialize(&8, &header.hash(), &Default::default());
assert!(Grandpa::pending_change().is_some());
assert_eq!(Grandpa::grandpa_authorities(), vec![(4, 1), (5, 1), (6, 1)]);
assert!(Grandpa::schedule_change(vec![(5, 1)], 1, None).is_err());
Grandpa::on_finalise(8);
header = System::finalise();
Grandpa::on_finalize(8);
header = System::finalize();
}
// normal change applied. but we can't apply a new forced change for some
// time.
for i in 9..11 {
System::initialise(&i, &header.hash(), &Default::default());
System::initialize(&i, &header.hash(), &Default::default());
assert!(Grandpa::pending_change().is_none());
assert_eq!(Grandpa::grandpa_authorities(), vec![(5, 1)]);
assert_eq!(Grandpa::next_forced(), Some(11));
assert!(Grandpa::schedule_change(vec![(5, 1), (6, 1)], 5, Some(0)).is_err());
Grandpa::on_finalise(i);
header = System::finalise();
Grandpa::on_finalize(i);
header = System::finalize();
}
{
System::initialise(&11, &header.hash(), &Default::default());
System::initialize(&11, &header.hash(), &Default::default());
assert!(Grandpa::pending_change().is_none());
assert!(Grandpa::schedule_change(vec![(5, 1), (6, 1), (7, 1)], 5, Some(0)).is_ok());
assert_eq!(Grandpa::next_forced(), Some(21));
Grandpa::on_finalise(11);
header = System::finalise();
Grandpa::on_finalize(11);
header = System::finalize();
}
let _ = header;
});