fixed upcomming typo

Author: SurfingNerd

crates/ethcore/src/engines/hbbft/hbbft_network_fork_manager.rs

@@ -82,10 +82,10 @@ impl HbbftFork {
 /// It allows cheap queries to see if a Fork is pending,
 /// and stores information about a fork that is finished.
 pub struct HbbftNetworkForkManager {
-    /// a ordered list with upcomming forks.
+    /// a ordered list with upcoming forks.
     finished_forks: VecDeque<HbbftFork>,
 
-    /// a ordered list with upcomming forks, including a fork that is in progress.
+    /// a ordered list with upcoming forks, including a fork that is in progress.
     /// see @is_currently_forking for more information.
     pending_forks: VecDeque<HbbftFork>,
 
@@ -271,12 +271,12 @@ impl HbbftNetworkForkManager {
                 }
 
                 let fork = HbbftFork::from_definition(fork_def);
-                debug!(target: "engine", "hbbft-hardfork: added upcomming fork - add block {:?}", fork.start_block);
+                debug!(target: "engine", "hbbft-hardfork: added upcoming fork - add block {:?}", fork.start_block);
 
                 self.pending_forks.push_back(fork);
             } else if fork_def.block_number_start >= startup_block_number {
                 let fork = HbbftFork::from_definition(fork_def);
-                debug!(target: "engine", "hbbft-hardfork: added upcomming fork - add block {:?}", fork.start_block);
+                debug!(target: "engine", "hbbft-hardfork: added upcoming fork - add block {:?}", fork.start_block);
 
                 self.pending_forks.push_back(fork);
             }

crates/ethcore/src/engines/hbbft/hbbft_peers_management.rs

@@ -256,7 +256,7 @@ impl HbbftPeersManagement {
     /// if we drop out as a current validator,
     /// as well a pending validator, we should drop
     /// all reserved connections.
-    /// in later addition, we will keep the Partner Node Connections here. (upcomming feature)
+    /// in later addition, we will keep the Partner Node Connections here. (upcoming feature)
     pub fn disconnect_all_validators(&mut self, client_arc: &Arc<dyn EngineClient>) {
         // we safely can disconnect even in situation where we are syncing.
 

crates/ethcore/src/engines/hbbft/keygen_transactions.rs

@@ -45,7 +45,7 @@ pub struct ServiceTransactionMemory {
     /// Nonce of the transaction it was send with.
     //pub nonce: U256,
 
-    /// Block number, at wich this transaction was "sent",
+    /// Block number, at which this transaction was "sent",
     /// in the meaning of prepared to be propagated.
     pub block_sent: u64,
     // It would be good to know if the Service Transaction got included.
@@ -96,7 +96,7 @@ impl KeygenTransactionSender {
         client: &dyn EngineClient,
         mining_address: &Address,
         mode_to_check: KeyGenMode,
-        upcomming_epoch: &U256,
+        upcoming_epoch: &U256,
         current_round: &U256,
     ) -> Result<ShouldSendKeyAnswer, CallError> {
         let keygen_mode = get_pending_validator_key_generation_mode(client, mining_address)?;
@@ -105,12 +105,12 @@ impl KeygenTransactionSender {
                 Some(last_sent) => {
                     match &last_sent.transaction_type {
                         ServiceTransactionType::KeyGenTransaction(
-                            historic_upcomming_epoch,
+                            historic_upcoming_epoch,
                             historic_round,
                             historic_key_gen_mode,
                         ) => {
                             if *historic_key_gen_mode != keygen_mode
-                                || *historic_upcomming_epoch != upcomming_epoch.as_u64()
+                                || *historic_upcoming_epoch != upcoming_epoch.as_u64()
                                 || *historic_round != current_round.as_u64()
                             {
                                 // other key gen mode, we need to send.
@@ -163,14 +163,14 @@ impl KeygenTransactionSender {
         &mut self,
         client: &dyn EngineClient,
         mining_address: &Address,
-        upcomming_epoch: &U256,
+        upcoming_epoch: &U256,
         current_round: &U256,
     ) -> Result<ShouldSendKeyAnswer, CallError> {
         self.should_send(
             client,
             mining_address,
             KeyGenMode::WritePart,
-            upcomming_epoch,
+            upcoming_epoch,
             current_round,
         )
     }
@@ -179,14 +179,14 @@ impl KeygenTransactionSender {
         &mut self,
         client: &dyn EngineClient,
         mining_address: &Address,
-        upcomming_epoch: &U256,
+        upcoming_epoch: &U256,
         current_round: &U256,
     ) -> Result<ShouldSendKeyAnswer, CallError> {
         self.should_send(
             client,
             mining_address,
             KeyGenMode::WriteAck,
-            upcomming_epoch,
+            upcoming_epoch,
             current_round,
         )
     }