Update to latest substrate master (#197)

polkadot/runtime/src/curated_grandpa.rs

@@ -41,7 +41,7 @@ decl_module! {
 			grandpa::Module::<T>::schedule_change(voters, T::BlockNumber::zero(), None)?;
 		}
 
-		fn on_finalise(block_number: T::BlockNumber) {
+		fn on_finalize(block_number: T::BlockNumber) {
 			// every so often shuffle the voters and issue a change.
 			let shuffle_period: u64 = Self::shuffle_period().as_();
 			if shuffle_period == 0 { return }
@@ -75,10 +75,10 @@ decl_module! {
 					voters.swap(remaining - 1, voter_index);
 				}
 
-				// finalisation order is undefined, so grandpa's on_finalise might
+				// finalization order is undefined, so grandpa's on_finalize might
 				// have already been called. calling it again is OK though.
 				let _ = grandpa::Module::<T>::schedule_change(voters, T::BlockNumber::zero(), None);
-				grandpa::Module::<T>::on_finalise(block_number);
+				grandpa::Module::<T>::on_finalize(block_number);
 			}
 		}
 	}

polkadot/runtime/src/lib.rs

@@ -298,8 +298,8 @@ impl_runtime_apis! {
 			Executive::execute_block(block)
 		}
 
-		fn initialise_block(header: &<Block as BlockT>::Header) {
-			Executive::initialise_block(header)
+		fn initialize_block(header: &<Block as BlockT>::Header) {
+			Executive::initialize_block(header)
 		}
 	}
 
@@ -314,8 +314,8 @@ impl_runtime_apis! {
 			Executive::apply_extrinsic(extrinsic)
 		}
 
-		fn finalise_block() -> <Block as BlockT>::Header {
-			Executive::finalise_block()
+		fn finalize_block() -> <Block as BlockT>::Header {
+			Executive::finalize_block()
 		}
 
 		fn inherent_extrinsics(data: InherentData) -> Vec<<Block as BlockT>::Extrinsic> {