substrate update: change UK spelling to US

src/governance/council.rs

@@ -66,7 +66,7 @@ decl_module! {
     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
         fn deposit_event<T>() = default;
 
-        fn on_finalise(now: T::BlockNumber) {
+        fn on_finalize(now: T::BlockNumber) {
             if now == Self::term_ends_at() {
                 Self::deposit_event(RawEvent::CouncilTermEnded(now));
                 T::CouncilTermEnded::council_term_ended();

src/governance/election.rs

@@ -718,7 +718,7 @@ decl_module! {
         fn deposit_event<T>() = default;
 
         // No origin so this is a priviledged call
-        fn on_finalise(now: T::BlockNumber) {
+        fn on_finalize(now: T::BlockNumber) {
             Self::check_if_stage_is_ending(now);
         }
 
@@ -1955,7 +1955,7 @@ mod tests {
 
             let n = 1 + Election::announcing_period();
             System::set_block_number(n);
-            let _ = Election::on_finalise(n);
+            let _ = Election::on_finalize(n);
 
             for i in 1..20 {
                 assert!(Election::vote(
@@ -1982,7 +1982,7 @@ mod tests {
 
             let n = n + Election::voting_period();
             System::set_block_number(n);
-            let _ = Election::on_finalise(n);
+            let _ = Election::on_finalize(n);
 
             for i in 1..20 {
                 assert!(Election::reveal(
@@ -2012,7 +2012,7 @@ mod tests {
 
             let n = n + Election::revealing_period();
             System::set_block_number(n);
-            let _ = Election::on_finalise(n);
+            let _ = Election::on_finalize(n);
 
             assert_eq!(
                 Council::active_council().len(),

src/governance/proposals.rs

@@ -323,7 +323,7 @@ decl_module! {
         }
 
         // Called on every block
-        fn on_finalise(n: T::BlockNumber) {
+        fn on_finalize(n: T::BlockNumber) {
             if let Err(e) = Self::end_block(n) {
                 print(e);
             }
@@ -1110,7 +1110,7 @@ mod tests {
             assert_eq!(Proposals::votes_by_proposal(1), expected_votes);
 
             System::set_block_number(2);
-            let _ = Proposals::on_finalise(2);
+            let _ = Proposals::end_block(2);
 
             assert!(Proposals::active_proposal_ids().is_empty());
             assert_eq!(Proposals::proposals(1).status, Approved);
@@ -1152,7 +1152,7 @@ mod tests {
             assert_runtime_code_empty!();
 
             System::set_block_number(2);
-            let _ = Proposals::on_finalise(2);
+            let _ = Proposals::end_block(2);
 
             // Check that runtime code has been updated after proposal approved.
             assert_runtime_code!(wasm_code());
@@ -1208,7 +1208,7 @@ mod tests {
             assert_runtime_code_empty!();
 
             System::set_block_number(2);
-            let _ = Proposals::on_finalise(2);
+            let _ = Proposals::end_block(2);
 
             // Check that runtime code has been updated after proposal approved.
             assert_runtime_code!(wasm_code());
@@ -1263,14 +1263,14 @@ mod tests {
 
             let expiration_block = System::block_number() + Proposals::voting_period();
             System::set_block_number(2);
-            let _ = Proposals::on_finalise(2);
+            let _ = Proposals::end_block(2);
 
             // Check that runtime code has NOT been updated yet,
             // because not all councilors voted and voting period is not expired yet.
             assert_runtime_code_empty!();
 
             System::set_block_number(expiration_block);
-            let _ = Proposals::on_finalise(expiration_block);
+            let _ = Proposals::end_block(expiration_block);
 
             // Check that runtime code has been updated after proposal approved.
             assert_runtime_code!(wasm_code());
@@ -1326,7 +1326,7 @@ mod tests {
             assert_runtime_code_empty!();
 
             System::set_block_number(2);
-            let _ = Proposals::on_finalise(2);
+            let _ = Proposals::end_block(2);
 
             // Check that runtime code has NOT been updated after proposal slashed.
             assert_runtime_code_empty!();
@@ -1383,7 +1383,7 @@ mod tests {
             assert_runtime_code_empty!();
 
             System::set_block_number(2);
-            let _ = Proposals::on_finalise(2);
+            let _ = Proposals::end_block(2);
 
             // Check that runtime code has NOT been updated after proposal rejected.
             assert_runtime_code_empty!();
@@ -1440,7 +1440,7 @@ mod tests {
             assert_runtime_code_empty!();
 
             System::set_block_number(2);
-            let _ = Proposals::on_finalise(2);
+            let _ = Proposals::end_block(2);
 
             // Check that runtime code has NOT been updated after proposal slashed.
             assert_runtime_code_empty!();
@@ -1507,7 +1507,7 @@ mod tests {
 
             let expiration_block = System::block_number() + Proposals::voting_period();
             System::set_block_number(expiration_block);
-            let _ = Proposals::on_finalise(expiration_block);
+            let _ = Proposals::end_block(expiration_block);
 
             // Check that runtime code has NOT been updated after proposal slashed.
             assert_runtime_code_empty!();

src/migration.rs

@@ -56,7 +56,7 @@ decl_module! {
     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
         fn deposit_event<T>() = default;
 
-        fn on_initialise(_now: T::BlockNumber) {
+        fn on_initialize(_now: T::BlockNumber) {
             if Self::spec_version().map_or(true, |spec_version| VERSION.spec_version > spec_version) {
                 // mark store version with current version of the runtime
                 <SpecVersion<T>>::put(VERSION.spec_version);

src/roles/actors.rs

@@ -255,7 +255,7 @@ decl_module! {
     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
         fn deposit_event<T>() = default;
 
-        fn on_initialise(now: T::BlockNumber) {
+        fn on_initialize(now: T::BlockNumber) {
             // clear expired requests
             if now % T::BlockNumber::sa(REQUEST_CLEARING_INTERVAL) == T::BlockNumber::zero() {
                 let requests: Requests<T> = Self::role_entry_requests()
@@ -267,7 +267,7 @@ decl_module! {
             }
         }
 
-        fn on_finalise(now: T::BlockNumber) {
+        fn on_finalize(now: T::BlockNumber) {
 
             // payout rewards to actors
             for role in Self::available_roles().iter() {