Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.
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
5 changes: 1 addition & 4 deletions ethcore/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@ extern crate journaldb;
extern crate keccak_hash as hash;
extern crate keccak_hasher;
extern crate kvdb;
// Note: in `ethcore` this is only used by tests, so without `#[cfg(test)]` there's a warning.
// However, when building `parity-ethereum` this is needed. So there's something funny going on
// here.
#[cfg(any(test, feature = "test-helpers"))]
extern crate kvdb_memorydb;

extern crate len_caching_lock;
Expand All @@ -97,7 +95,6 @@ extern crate rand;
extern crate rayon;
extern crate rlp;
extern crate parity_util_mem;
extern crate parity_util_mem as mem;
Comment thread
dvdplm marked this conversation as resolved.
extern crate parity_util_mem as malloc_size_of;
extern crate rustc_hex;
extern crate serde;
Expand Down
4 changes: 2 additions & 2 deletions ethcore/src/trace/types/trace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ impl CreateResult {
}
}

/// Description of a _call_ action, either a `CALL` operation or a message transction.
/// Description of a _call_ action, either a `CALL` operation or a message transaction.
#[derive(Debug, Clone, PartialEq, RlpEncodable, RlpDecodable)]
pub struct Call {
/// The sending account.
Expand Down Expand Up @@ -102,7 +102,7 @@ impl Call {
}
}

/// Description of a _create_ action, either a `CREATE` operation or a create transction.
/// Description of a _create_ action, either a `CREATE` operation or a create transaction.
#[derive(Debug, Clone, PartialEq, RlpEncodable, RlpDecodable)]
pub struct Create {
/// The address of the creator.
Expand Down
2 changes: 1 addition & 1 deletion ethcore/types/src/transaction/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ impl fmt::Display for Error {
CodeBanned => "Contract code is temporarily banned.".into(),
InvalidChainId => "Transaction of this chain ID is not allowed on this chain.".into(),
InvalidSignature(ref err) => format!("Transaction has invalid signature: {}.", err),
NotAllowed => "Sender does not have permissions to execute this type of transction".into(),
NotAllowed => "Sender does not have permissions to execute this type of transaction".into(),
TooBig => "Transaction too big".into(),
InvalidRlp(ref err) => format!("Transaction has invalid RLP structure: {}.", err),
};
Expand Down