From d67369a01c531214fd0d2ab85448af35f4f9c558 Mon Sep 17 00:00:00 2001 From: gregg dourgarian Date: Tue, 19 Jul 2016 13:42:23 -0500 Subject: [PATCH] fix typos (#1644) --- ethcore/src/blockchain/block_info.rs | 2 +- ethcore/src/client/client.rs | 2 +- ethcore/src/miner/transaction_queue.rs | 2 +- ipc/codegen/src/serialization.rs | 2 +- ipc/nano/src/lib.rs | 2 +- parity/cli.rs | 8 ++++---- rpc/src/v1/impls/mod.rs | 2 +- rpc/src/v1/traits/eth.rs | 2 +- signer/src/ws_server/mod.rs | 2 +- sync/src/chain.rs | 2 +- util/src/rlp/untrusted_rlp.rs | 8 ++++---- util/src/trie/triedb.rs | 4 ++-- util/src/triehash.rs | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ethcore/src/blockchain/block_info.rs b/ethcore/src/blockchain/block_info.rs index 42f1bd439..a7827b043 100644 --- a/ethcore/src/blockchain/block_info.rs +++ b/ethcore/src/blockchain/block_info.rs @@ -38,7 +38,7 @@ pub enum BlockLocation { /// It's not a part of the canon chain. Branch, /// It's part of the fork which should become canon chain, - /// because it's total difficulty is higher than current + /// because its total difficulty is higher than current /// canon chain difficulty. BranchBecomingCanonChain(BranchBecomingCanonChainData), } diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs index e2ea3d463..ba830b634 100644 --- a/ethcore/src/client/client.rs +++ b/ethcore/src/client/client.rs @@ -1002,7 +1002,7 @@ impl MiningBlockChainClient for Client { self.trie_factory.clone(), false, // TODO: this will need to be parameterised once we want to do immediate mining insertion. self.state_db.lock().boxed_clone(), - &self.chain.block_header(&h).expect("h is best block hash: so it's header must exist: qed"), + &self.chain.block_header(&h).expect("h is best block hash: so its header must exist: qed"), self.build_last_hashes(h.clone()), author, gas_range_target, diff --git a/ethcore/src/miner/transaction_queue.rs b/ethcore/src/miner/transaction_queue.rs index f86bf3564..a1b56aaca 100644 --- a/ethcore/src/miner/transaction_queue.rs +++ b/ethcore/src/miner/transaction_queue.rs @@ -122,7 +122,7 @@ impl Ord for TransactionOrigin { } #[derive(Clone, Debug)] -/// Light structure used to identify transaction and it's order +/// Light structure used to identify transaction and its order struct TransactionOrder { /// Primary ordering factory. Difference between transaction nonce and expected nonce in state /// (e.g. Tx(nonce:5), State(nonce:0) -> height: 5) diff --git a/ipc/codegen/src/serialization.rs b/ipc/codegen/src/serialization.rs index 0ab70f93a..983fabd48 100644 --- a/ipc/codegen/src/serialization.rs +++ b/ipc/codegen/src/serialization.rs @@ -50,7 +50,7 @@ pub fn expand_serialization_implementation( let impl_item = match serialize_item(cx, &builder, &item) { Ok(item) => item, Err(Error) => { - // An error occured, but it should have been reported already. + // An error occurred, but it should have been reported already. return; }, }; diff --git a/ipc/nano/src/lib.rs b/ipc/nano/src/lib.rs index 5fb2faaa7..7131797aa 100644 --- a/ipc/nano/src/lib.rs +++ b/ipc/nano/src/lib.rs @@ -107,7 +107,7 @@ pub fn init_client(socket_addr: &str) -> Result, SocketError }) } -/// Error occured while establising socket or endpoint +/// Error occurred while establising socket or endpoint #[derive(Debug)] pub enum SocketError { /// Error establising duplex (paired) socket and/or endpoint diff --git a/parity/cli.rs b/parity/cli.rs index 1c90afdf0..928237d72 100644 --- a/parity/cli.rs +++ b/parity/cli.rs @@ -36,7 +36,7 @@ Operating Options: --mode MODE Set the operating mode. MODE can be one of: active - Parity continuously syncs the chain. passive - Parity syncs initially, then sleeps and - wakes regularly to resync. + wakes regularly to resync. dark - Parity syncs only when an external interface is active. [default: active]. --mode-timeout SECS Specify the number of seconds before inactivity @@ -141,11 +141,11 @@ Sealing/Mining Options: own - reseal only on a new local transaction; ext - reseal only on a new external transaction; all - reseal on all new transactions [default: own]. - --reseal-min-period MS Specify the minimum time between reseals from + --reseal-min-period MS Specify the minimum time between reseals from incoming transactions. MS is time measured in milliseconds [default: 2000]. --work-queue-size ITEMS Specify the number of historical work packages - which are kept cached lest a solution is found for + which are kept cached lest a solution is found for them later. High values take more memory but result in fewer unusable solutions [default: 20]. --tx-gas-limit GAS Apply a limit of GAS as the maximum amount of gas @@ -196,7 +196,7 @@ Footprint Options: fast - maintain journal overlay. Fast but 50MB used. auto - use the method most recently synced or default to fast if none synced [default: auto]. - --cache-pref-size BYTES Specify the prefered size of the blockchain cache in + --cache-pref-size BYTES Specify the preferred size of the blockchain cache in bytes [default: 16384]. --cache-max-size BYTES Specify the maximum size of the blockchain cache in bytes [default: 262144]. diff --git a/rpc/src/v1/impls/mod.rs b/rpc/src/v1/impls/mod.rs index 0f09035ed..c66350fdd 100644 --- a/rpc/src/v1/impls/mod.rs +++ b/rpc/src/v1/impls/mod.rs @@ -158,7 +158,7 @@ fn transaction_error(error: EthcoreError) -> Error { "Transaction fee is too low. There is another transaction with same nonce in the queue. Try increasing the fee or incrementing the nonce.".into() }, LimitReached => { - "There is too many transactions in the queue. Your transaction was dropped due to limit. Try increasing the fee.".into() + "There are too many transactions in the queue. Your transaction was dropped due to limit. Try increasing the fee.".into() }, InsufficientGasPrice { minimal, got } => { format!("Transaction fee is too low. It does not satisfy your node's minimal fee (minimal: {}, got: {}). Try increasing the fee.", minimal, got) diff --git a/rpc/src/v1/traits/eth.rs b/rpc/src/v1/traits/eth.rs index d78f36c4c..60d39d8ba 100644 --- a/rpc/src/v1/traits/eth.rs +++ b/rpc/src/v1/traits/eth.rs @@ -83,7 +83,7 @@ pub trait Eth: Sized + Send + Sync + 'static { /// Estimate gas needed for execution of given contract. fn estimate_gas(&self, _: Params) -> Result; - /// Get transaction by it's hash. + /// Get transaction by its hash. fn transaction_by_hash(&self, _: Params) -> Result; /// Returns transaction at given block hash and index. diff --git a/signer/src/ws_server/mod.rs b/signer/src/ws_server/mod.rs index d2d838b2c..40f9ee4fe 100644 --- a/signer/src/ws_server/mod.rs +++ b/signer/src/ws_server/mod.rs @@ -116,7 +116,7 @@ impl Server { io )), Err(any_error) => die(format!( - "Signer: Unknown error occured when starting Signer. Details: {:?}", + "Signer: Unknown error occurred when starting Signer. Details: {:?}", any_error )), Ok(server) => server, diff --git a/sync/src/chain.rs b/sync/src/chain.rs index 419407b17..c21e1c8f1 100644 --- a/sync/src/chain.rs +++ b/sync/src/chain.rs @@ -689,7 +689,7 @@ impl ChainSync { self.state = SyncState::Waiting; } - /// Find something to do for a peer. Called for a new peer or when a peer is done with it's task. + /// Find something to do for a peer. Called for a new peer or when a peer is done with its task. fn sync_peer(&mut self, io: &mut SyncIo, peer_id: PeerId, force: bool) { if !self.active_peers.contains(&peer_id) { trace!(target: "sync", "Skipping deactivated peer"); diff --git a/util/src/rlp/untrusted_rlp.rs b/util/src/rlp/untrusted_rlp.rs index 8e9b6d70e..a55bb0f3b 100644 --- a/util/src/rlp/untrusted_rlp.rs +++ b/util/src/rlp/untrusted_rlp.rs @@ -201,7 +201,7 @@ impl<'a, 'view> View<'a, 'view> for UntrustedRlp<'a> where 'a: 'view { return Err(DecoderError::RlpExpectedToBeList); } - // move to cached position if it's index is less or equal to + // move to cached position if its index is less or equal to // current search index, otherwise move to beginning of list let c = self.offset_cache.get(); let (mut bytes, to_skip) = match c.index <= index { @@ -334,9 +334,9 @@ impl<'a> BasicDecoder<'a> { /// Return first item info. fn payload_info(bytes: &[u8]) -> Result { let item = try!(PayloadInfo::from(bytes)); - match item.header_len.checked_add(item.value_len) { - Some(x) if x <= bytes.len() => Ok(item), - _ => Err(DecoderError::RlpIsTooShort), + match item.header_len.checked_add(item.value_len) { + Some(x) if x <= bytes.len() => Ok(item), + _ => Err(DecoderError::RlpIsTooShort), } } } diff --git a/util/src/trie/triedb.rs b/util/src/trie/triedb.rs index 57e5834a0..a50904cc1 100644 --- a/util/src/trie/triedb.rs +++ b/util/src/trie/triedb.rs @@ -84,7 +84,7 @@ impl<'db> TrieDB<'db> { ret } - /// Convert a vector of hashes to a hashmap of hash to occurances. + /// Convert a vector of hashes to a hashmap of hash to occurrences. pub fn to_map(hashes: Vec) -> HashMap { let mut r: HashMap = HashMap::new(); for h in hashes.into_iter() { @@ -93,7 +93,7 @@ impl<'db> TrieDB<'db> { r } - /// Determine occurances of items in the backing database which are not related to this + /// Determine occurrences of items in the backing database which are not related to this /// trie. pub fn db_items_remaining(&self) -> HashMap { let mut ret = self.db.keys(); diff --git a/util/src/triehash.rs b/util/src/triehash.rs index bedea9b0f..e95c3b5f9 100644 --- a/util/src/triehash.rs +++ b/util/src/triehash.rs @@ -255,7 +255,7 @@ fn hash256rlp(input: &[(Vec, Vec)], pre_len: usize, stream: &mut RlpStre begin += len; } - // if fist key len is equal prefix, append it's value + // if fist key len is equal prefix, append its value match pre_len == key.len() { true => { stream.append(&value); }, false => { stream.append_empty_data(); }