Remove on_finalise and on_initialise

frame/support/src/dispatch.rs

@@ -2037,15 +2037,9 @@ macro_rules! __check_reserved_fn_name {
 	(on_runtime_upgrade $( $rest:ident )*) => {
 		$crate::__check_reserved_fn_name!(@compile_error on_runtime_upgrade);
 	};
-	(on_initialise $( $rest:ident )*) => {
-		$crate::__check_reserved_fn_name!(@compile_error_renamed on_initialise on_initialize);
-	};
 	(on_finalize $( $rest:ident )*) => {
 		$crate::__check_reserved_fn_name!(@compile_error on_finalize);
 	};
-	(on_finalise $( $rest:ident )*) => {
-		$crate::__check_reserved_fn_name!(@compile_error_renamed on_finalise on_finalize);
-	};
 	(offchain_worker $( $rest:ident )*) => {
 		$crate::__check_reserved_fn_name!(@compile_error offchain_worker);
 	};

frame/support/test/tests/reserved_keyword/on_initialize.rs

@@ -27,6 +27,6 @@ macro_rules! reserved {
 	}
 }
 
-reserved!(on_finalize on_initialize on_finalise on_initialise on_runtime_upgrade offchain_worker deposit_event);
+reserved!(on_finalize on_initialize on_runtime_upgrade offchain_worker deposit_event);
 
 fn main() {}

frame/support/test/tests/reserved_keyword/on_initialize.stderr

@@ -1,55 +1,39 @@
 error: Invalid call fn name: `on_finalize`, name is reserved and doesn't match expected signature, please refer to `decl_module!` documentation to see the appropriate usage, or rename it to an unreserved keyword.
   --> $DIR/on_initialize.rs:30:1
    |
-30 | reserved!(on_finalize on_initialize on_finalise on_initialise on_runtime_upgrade offchain_worker deposit_event);
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
+30 | reserved!(on_finalize on_initialize on_runtime_upgrade offchain_worker deposit_event);
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
    |
    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 error: Invalid call fn name: `on_initialize`, name is reserved and doesn't match expected signature, please refer to `decl_module!` documentation to see the appropriate usage, or rename it to an unreserved keyword.
   --> $DIR/on_initialize.rs:30:1
    |
-30 | reserved!(on_finalize on_initialize on_finalise on_initialise on_runtime_upgrade offchain_worker deposit_event);
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
-   |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
-
-error: `on_finalise` was renamed to `on_finalize`. Please rename your function accordingly.
-  --> $DIR/on_initialize.rs:30:1
-   |
-30 | reserved!(on_finalize on_initialize on_finalise on_initialise on_runtime_upgrade offchain_worker deposit_event);
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
-   |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
-
-error: `on_initialise` was renamed to `on_initialize`. Please rename your function accordingly.
-  --> $DIR/on_initialize.rs:30:1
-   |
-30 | reserved!(on_finalize on_initialize on_finalise on_initialise on_runtime_upgrade offchain_worker deposit_event);
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
+30 | reserved!(on_finalize on_initialize on_runtime_upgrade offchain_worker deposit_event);
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
    |
    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 error: Invalid call fn name: `on_runtime_upgrade`, name is reserved and doesn't match expected signature, please refer to `decl_module!` documentation to see the appropriate usage, or rename it to an unreserved keyword.
   --> $DIR/on_initialize.rs:30:1
    |
-30 | reserved!(on_finalize on_initialize on_finalise on_initialise on_runtime_upgrade offchain_worker deposit_event);
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
+30 | reserved!(on_finalize on_initialize on_runtime_upgrade offchain_worker deposit_event);
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
    |
    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 error: Invalid call fn name: `offchain_worker`, name is reserved and doesn't match expected signature, please refer to `decl_module!` documentation to see the appropriate usage, or rename it to an unreserved keyword.
   --> $DIR/on_initialize.rs:30:1
    |
-30 | reserved!(on_finalize on_initialize on_finalise on_initialise on_runtime_upgrade offchain_worker deposit_event);
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
+30 | reserved!(on_finalize on_initialize on_runtime_upgrade offchain_worker deposit_event);
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
    |
    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 error: `deposit_event` function is reserved and must follow the syntax: `$vis:vis fn deposit_event() = default;`
   --> $DIR/on_initialize.rs:30:1
    |
-30 | reserved!(on_finalize on_initialize on_finalise on_initialise on_runtime_upgrade offchain_worker deposit_event);
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
+30 | reserved!(on_finalize on_initialize on_runtime_upgrade offchain_worker deposit_event);
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
    |
    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)

primitives/consensus/common/src/select_chain.rs

@@ -23,11 +23,11 @@ use sp_runtime::traits::{Block as BlockT, NumberFor};
 /// specific chain build.
 ///
 /// The Strategy can be customized for the two use cases of authoring new blocks
-/// upon the best chain or which fork to finalise. Unless implemented differently
+/// upon the best chain or which fork to finalize. Unless implemented differently
 /// by default finalization methods fall back to use authoring, so as a minimum
 /// `_authoring`-functions must be implemented.
 ///
-/// Any particular user must make explicit, however, whether they intend to finalise
+/// Any particular user must make explicit, however, whether they intend to finalize
 /// or author through the using the right function call, as these might differ in
 /// some implementations.
 ///

primitives/runtime/src/offchain/http.rs

@@ -241,7 +241,7 @@ impl<'a, I: AsRef<[u8]>, T: IntoIterator<Item=I>> Request<'a, T> {
 			sp_io::offchain::http_request_write_body(id, chunk.as_ref(), self.deadline)?;
 		}
 
-		// finalise the request
+		// finalize the request
 		sp_io::offchain::http_request_write_body(id, &[], self.deadline)?;
 
 		Ok(PendingRequest {