Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

More typos #8640

Merged
merged 1 commit into from
May 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions parity/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ fn latest_exe_path() -> Option<PathBuf> {

fn set_spec_name_override(spec_name: String) {
if let Err(e) = create_dir_all(default_hypervisor_path())
.and_then(|_| File::create(updates_path("spec_name_overide"))
.and_then(|_| File::create(updates_path("spec_name_override"))
.and_then(|mut f| f.write_all(spec_name.as_bytes())))
{
warn!("Couldn't override chain spec: {} at {:?}", e, updates_path("spec_name_overide"));
warn!("Couldn't override chain spec: {} at {:?}", e, updates_path("spec_name_override"));
}
}

fn take_spec_name_override() -> Option<String> {
let p = updates_path("spec_name_overide");
let p = updates_path("spec_name_override");
let r = File::open(p.clone()).ok()
.and_then(|mut f| { let mut spec_name = String::new(); f.read_to_string(&mut spec_name).ok().map(|_| spec_name) });
let _ = remove_file(p);
Expand Down
2 changes: 1 addition & 1 deletion secret_store/src/acl_storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ impl CachedContract {

pub fn check(&mut self, requester: Address, document: &ServerKeyId) -> Result<bool, Error> {
if let Some(client) = self.client.get() {
// call contract to check accesss
// call contract to check access
match self.contract_addr {
Some(contract_address) => {
let do_call = |data| client.call_contract(BlockId::Latest, contract_address, data);
Expand Down
10 changes: 5 additions & 5 deletions secret_store/src/key_server_set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ impl CachedContract {

pub fn update(&mut self, enacted: Vec<H256>, retracted: Vec<H256>) {
if let Some(client) = self.client.get() {
// read new snapshot from reqistry (if something has chnaged)
// read new snapshot from registry (if something has changed)
self.read_from_registry_if_required(&*client, enacted, retracted);

// update number of confirmations (if there's future new set)
Expand Down Expand Up @@ -371,7 +371,7 @@ impl CachedContract {
None => {
// no contract installed => empty snapshot
// WARNING: after restart current_set will be reset to the set from configuration file
// even though we have reset to empty set here. We are not considerning this as an issue
// even though we have reset to empty set here. We are not considering this as an issue
// because it is actually the issue of administrator.
self.snapshot = Default::default();
self.future_new_set = None;
Expand Down Expand Up @@ -540,7 +540,7 @@ fn update_number_of_confirmations<F1: Fn() -> H256, F2: Fn(H256) -> Option<u64>>
// not enough confirmations => do nothing
Some(_) => return,
// if number of confirmations is None, then reorg has happened && we need to reset block
// (some more intelligent startegy is possible, but let's stick to simplest one)
// (some more intelligent strategy is possible, but let's stick to simplest one)
None => {
future_new_set.block = latest_block();
return;
Expand All @@ -556,9 +556,9 @@ fn update_number_of_confirmations<F1: Fn() -> H256, F2: Fn(H256) -> Option<u64>>
fn update_last_transaction_block(client: &Client, migration_id: &H256, previous_transaction: &mut Option<PreviousMigrationTransaction>) -> bool {
let last_block = client.block_number(BlockId::Latest).unwrap_or_default();
match previous_transaction.as_ref() {
// no previous transaction => send immideately
// no previous transaction => send immediately
None => (),
// previous transaction has been sent for other migration process => send immideately
// previous transaction has been sent for other migration process => send immediately
Some(tx) if tx.migration_id != *migration_id => (),
// if we have sent the same type of transaction recently => do nothing (hope it will be mined eventually)
// if we have sent the same transaction some time ago =>
Expand Down
2 changes: 1 addition & 1 deletion secret_store/src/key_storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ pub struct SerializableDocumentKeyShareV0 {
/// V1 of encrypted key share, as it is stored by key storage on the single key server.
#[derive(Serialize, Deserialize)]
struct SerializableDocumentKeyShareV1 {
/// Authore of the entry.
/// Author of the entry.
pub author: SerializablePublic,
/// Decryption threshold (at least threshold + 1 nodes are required to decrypt data).
pub threshold: usize,
Expand Down
2 changes: 1 addition & 1 deletion secret_store/src/serialization.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ impl_bytes!(SerializableSignature, Signature, false, ());
/// Serializable shadow decryption result.
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct SerializableEncryptedDocumentKeyShadow {
/// Decrypted secret point. It is partially decrypted if shadow decrpytion was requested.
/// Decrypted secret point. It is partially decrypted if shadow decryption was requested.
pub decrypted_secret: SerializablePublic,
/// Shared common point.
pub common_point: SerializablePublic,
Expand Down
2 changes: 1 addition & 1 deletion secret_store/src/traits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ pub trait MessageSigner: ServerKeyGenerator {
/// Administrative sessions server.
pub trait AdminSessionsServer {
/// Change servers set so that nodes in new_servers_set became owners of shares for all keys.
/// And old nodes (i.e. cluste nodes except new_servers_set) have clear databases.
/// And old nodes (i.e. cluster nodes except new_servers_set) have clear databases.
/// WARNING: newly generated keys will be distributed among all cluster nodes. So this session
/// must be followed with cluster nodes change (either via contract, or config files).
fn change_servers_set(&self, old_set_signature: RequestSignature, new_set_signature: RequestSignature, new_servers_set: BTreeSet<NodeId>) -> Result<(), Error>;
Expand Down
2 changes: 1 addition & 1 deletion secret_store/src/types/all.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ pub struct ClusterConfiguration {
/// Shadow decryption result.
#[derive(Clone, Debug, PartialEq)]
pub struct EncryptedDocumentKeyShadow {
/// Decrypted secret point. It is partially decrypted if shadow decrpytion was requested.
/// Decrypted secret point. It is partially decrypted if shadow decryption was requested.
pub decrypted_secret: ethkey::Public,
/// Shared common point.
pub common_point: Option<ethkey::Public>,
Expand Down
8 changes: 4 additions & 4 deletions secret_store/src/types/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ pub enum Error {
/// Document key with this ID is not yet stored.
DocumentKeyIsNotFound,
/// Consensus is temporary unreachable. Means that something is currently blocking us from either forming
/// consensus group (like disconnecting from too many nodes, which are AGREE to partticipate in consensus)
/// consensus group (like disconnecting from too many nodes, which are AGREE to participate in consensus)
/// or from rejecting request (disconnecting from AccessDenied-nodes).
ConsensusTemporaryUnreachable,
/// Consensus is unreachable. It doesn't mean that it will ALWAYS remain unreachable, but right NOW we have
Expand All @@ -78,9 +78,9 @@ pub enum Error {
InsufficientRequesterData(String),
/// Cryptographic error.
EthKey(String),
/// I/O error has occured.
/// I/O error has occurred.
Io(String),
/// Deserialization error has occured.
/// Deserialization error has occurred.
Serde(String),
/// Hyper error.
Hyper(String),
Expand Down Expand Up @@ -148,7 +148,7 @@ impl fmt::Display for Error {
Error::DocumentKeyIsNotFound => write!(f, "Document key with this ID is not found"),
Error::ConsensusUnreachable => write!(f, "Consensus unreachable"),
Error::ConsensusTemporaryUnreachable => write!(f, "Consensus temporary unreachable"),
Error::AccessDenied => write!(f, "Access dened"),
Error::AccessDenied => write!(f, "Access denied"),
Error::ExclusiveSessionActive => write!(f, "Exclusive session active"),
Error::HasActiveSessions => write!(f, "Unable to start exclusive session"),
Error::InsufficientRequesterData(ref e) => write!(f, "Insufficient requester data: {}", e),
Expand Down