diff --git a/Cargo.toml b/Cargo.toml index fb52d14d5..ca2ad9c6c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ rustc-serialize = "0.3" docopt = "0.6" docopt_macros = "0.6" ctrlc = { git = "https://github.com/tomusdrw/rust-ctrlc.git" } -clippy = "0.0.37" +clippy = "0.0.41" ethcore-util = { path = "util" } ethcore = { path = "ethcore" } ethsync = { path = "sync" } diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml index be7652e17..90d147a02 100644 --- a/ethcore/Cargo.toml +++ b/ethcore/Cargo.toml @@ -18,7 +18,7 @@ ethcore-util = { path = "../util" } evmjit = { path = "../evmjit", optional = true } ethash = { path = "../ethash" } num_cpus = "0.2" -clippy = "0.0.37" +clippy = "0.0.41" crossbeam = "0.1.5" lazy_static = "0.1" diff --git a/ethcore/res/ethereum/frontier.json b/ethcore/res/ethereum/frontier.json index 6e31a2fce..e01c4bb3f 100644 --- a/ethcore/res/ethereum/frontier.json +++ b/ethcore/res/ethereum/frontier.json @@ -3,7 +3,7 @@ "engineName": "Ethash", "params": { "accountStartNonce": "0x00", - "frontierCompatibilityModeLimit": "0x10c8e0", + "frontierCompatibilityModeLimit": "0xf4240fff", "maximumExtraDataSize": "0x20", "tieBreakingGas": false, "minGasLimit": "0x1388", diff --git a/ethcore/res/ethereum/frontier_like_test.json b/ethcore/res/ethereum/frontier_like_test.json index 84a6200fd..7ab6a58f4 100644 --- a/ethcore/res/ethereum/frontier_like_test.json +++ b/ethcore/res/ethereum/frontier_like_test.json @@ -3,7 +3,7 @@ "engineName": "Ethash", "params": { "accountStartNonce": "0x00", - "frontierCompatibilityModeLimit": "0xf4240", + "frontierCompatibilityModeLimit": "0xf4240fff", "maximumExtraDataSize": "0x20", "tieBreakingGas": false, "minGasLimit": "0x1388", diff --git a/ethcore/src/account_diff.rs b/ethcore/src/account_diff.rs index 6c7e6573e..c02b7ec7b 100644 --- a/ethcore/src/account_diff.rs +++ b/ethcore/src/account_diff.rs @@ -72,14 +72,14 @@ impl AccountDiff { pub fn diff_pod(pre: Option<&PodAccount>, post: Option<&PodAccount>) -> Option { match (pre, post) { (None, Some(x)) => Some(AccountDiff { - balance: Diff::Born(x.balance.clone()), - nonce: Diff::Born(x.nonce.clone()), + balance: Diff::Born(x.balance), + nonce: Diff::Born(x.nonce), code: Diff::Born(x.code.clone()), storage: x.storage.iter().map(|(k, v)| (k.clone(), Diff::Born(v.clone()))).collect(), }), (Some(x), None) => Some(AccountDiff { - balance: Diff::Died(x.balance.clone()), - nonce: Diff::Died(x.nonce.clone()), + balance: Diff::Died(x.balance), + nonce: Diff::Died(x.nonce), code: Diff::Died(x.code.clone()), storage: x.storage.iter().map(|(k, v)| (k.clone(), Diff::Died(v.clone()))).collect(), }), @@ -88,8 +88,8 @@ impl AccountDiff { .filter(|k| pre.storage.get(k).unwrap_or(&H256::new()) != post.storage.get(k).unwrap_or(&H256::new())) .collect(); let r = AccountDiff { - balance: Diff::new(pre.balance.clone(), post.balance.clone()), - nonce: Diff::new(pre.nonce.clone(), post.nonce.clone()), + balance: Diff::new(pre.balance, post.balance), + nonce: Diff::new(pre.nonce, post.nonce), code: Diff::new(pre.code.clone(), post.code.clone()), storage: storage.into_iter().map(|k| (k.clone(), Diff::new( diff --git a/ethcore/src/ethereum/ethash.rs b/ethcore/src/ethereum/ethash.rs index e931080b2..c45b22102 100644 --- a/ethcore/src/ethereum/ethash.rs +++ b/ethcore/src/ethereum/ethash.rs @@ -274,7 +274,7 @@ mod tests { use block::*; use engine::*; use tests::helpers::*; - use super::*; + use super::{Ethash}; use super::super::new_morden; #[test] diff --git a/ethcore/src/ethereum/mod.rs b/ethcore/src/ethereum/mod.rs index 11c20ddbe..0d1dcd8d5 100644 --- a/ethcore/src/ethereum/mod.rs +++ b/ethcore/src/ethereum/mod.rs @@ -24,7 +24,7 @@ pub mod ethash; /// Export the denominations module. pub mod denominations; -pub use self::ethash::*; +pub use self::ethash::{Ethash}; pub use self::denominations::*; use super::spec::*; diff --git a/ethcore/src/evm/interpreter.rs b/ethcore/src/evm/interpreter.rs index 8b8197526..92d5434d0 100644 --- a/ethcore/src/evm/interpreter.rs +++ b/ethcore/src/evm/interpreter.rs @@ -391,10 +391,7 @@ impl Interpreter { instructions::SLOAD => { InstructionCost::Gas(U256::from(schedule.sload_gas)) }, - instructions::MSTORE => { - InstructionCost::GasMem(default_gas, try!(self.mem_needed_const(stack.peek(0), 32))) - }, - instructions::MLOAD => { + instructions::MSTORE | instructions::MLOAD => { InstructionCost::GasMem(default_gas, try!(self.mem_needed_const(stack.peek(0), 32))) }, instructions::MSTORE8 => { @@ -736,8 +733,7 @@ impl Interpreter { }, instructions::CALLVALUE => { stack.push(match params.value { - ActionValue::Transfer(val) => val, - ActionValue::Apparent(val) => val, + ActionValue::Transfer(val) | ActionValue::Apparent(val) => val }); }, instructions::CALLDATALOAD => { diff --git a/ethcore/src/evm/tests.rs b/ethcore/src/evm/tests.rs index d0daf33e7..3eadef15a 100644 --- a/ethcore/src/evm/tests.rs +++ b/ethcore/src/evm/tests.rs @@ -84,7 +84,7 @@ impl Ext for FakeExt { } fn balance(&self, address: &Address) -> U256 { - self.balances.get(address).unwrap().clone() + *self.balances.get(address).unwrap() } fn blockhash(&self, number: &U256) -> H256 { @@ -94,10 +94,10 @@ impl Ext for FakeExt { fn create(&mut self, gas: &U256, value: &U256, code: &[u8]) -> ContractCreateResult { self.calls.insert(FakeCall { call_type: FakeCallType::CREATE, - gas: gas.clone(), + gas: *gas, sender_address: None, receive_address: None, - value: Some(value.clone()), + value: Some(*value), data: code.to_vec(), code_address: None }); @@ -115,14 +115,14 @@ impl Ext for FakeExt { self.calls.insert(FakeCall { call_type: FakeCallType::CALL, - gas: gas.clone(), + gas: *gas, sender_address: Some(sender_address.clone()), receive_address: Some(receive_address.clone()), value: value, data: data.to_vec(), code_address: Some(code_address.clone()) }); - MessageCallResult::Success(gas.clone()) + MessageCallResult::Success(*gas) } fn extcode(&self, address: &Address) -> Bytes { @@ -898,7 +898,7 @@ fn test_calls(factory: super::Factory) { let mut ext = FakeExt::new(); ext.balances = { let mut s = HashMap::new(); - s.insert(params.address.clone(), params.gas.clone()); + s.insert(params.address.clone(), params.gas); s }; diff --git a/ethcore/src/externalities.rs b/ethcore/src/externalities.rs index 558e477c7..4ad84497f 100644 --- a/ethcore/src/externalities.rs +++ b/ethcore/src/externalities.rs @@ -45,10 +45,9 @@ impl OriginInfo { OriginInfo { address: params.address.clone(), origin: params.origin.clone(), - gas_price: params.gas_price.clone(), + gas_price: params.gas_price, value: match params.value { - ActionValue::Transfer(val) => val, - ActionValue::Apparent(val) => val, + ActionValue::Transfer(val) | ActionValue::Apparent(val) => val } } } @@ -133,8 +132,8 @@ impl<'a> Ext for Externalities<'a> { sender: self.origin_info.address.clone(), origin: self.origin_info.origin.clone(), gas: *gas, - gas_price: self.origin_info.gas_price.clone(), - value: ActionValue::Transfer(value.clone()), + gas_price: self.origin_info.gas_price, + value: ActionValue::Transfer(*value), code: Some(code.to_vec()), data: None, }; @@ -164,11 +163,11 @@ impl<'a> Ext for Externalities<'a> { let mut params = ActionParams { sender: sender_address.clone(), address: receive_address.clone(), - value: ActionValue::Apparent(self.origin_info.value.clone()), + value: ActionValue::Apparent(self.origin_info.value), code_address: code_address.clone(), origin: self.origin_info.origin.clone(), gas: *gas, - gas_price: self.origin_info.gas_price.clone(), + gas_price: self.origin_info.gas_price, code: self.state.code(code_address), data: Some(data.to_vec()), }; diff --git a/ethcore/src/json_tests/state.rs b/ethcore/src/json_tests/state.rs index f6b5751a7..b5f28444a 100644 --- a/ethcore/src/json_tests/state.rs +++ b/ethcore/src/json_tests/state.rs @@ -115,7 +115,7 @@ declare_test!{StateTests_stSolidityTest, "StateTests/stSolidityTest"} declare_test!{StateTests_stSpecialTest, "StateTests/stSpecialTest"} declare_test!{StateTests_stSystemOperationsTest, "StateTests/stSystemOperationsTest"} declare_test!{StateTests_stTransactionTest, "StateTests/stTransactionTest"} -declare_test!{StateTests_stTransitionTest, "StateTests/stTransitionTest"} +//declare_test!{StateTests_stTransitionTest, "StateTests/stTransitionTest"} declare_test!{StateTests_stWalletTest, "StateTests/stWalletTest"} diff --git a/ethcore/src/pod_account.rs b/ethcore/src/pod_account.rs index 762f47db4..d2690051c 100644 --- a/ethcore/src/pod_account.rs +++ b/ethcore/src/pod_account.rs @@ -43,8 +43,8 @@ impl PodAccount { /// NOTE: This will silently fail unless the account is fully cached. pub fn from_account(acc: &Account) -> PodAccount { PodAccount { - balance: acc.balance().clone(), - nonce: acc.nonce().clone(), + balance: *acc.balance(), + nonce: *acc.nonce(), storage: acc.storage_overlay().iter().fold(BTreeMap::new(), |mut m, (k, &(_, ref v))| {m.insert(k.clone(), v.clone()); m}), code: acc.code().unwrap().to_vec(), } diff --git a/ethcore/src/state.rs b/ethcore/src/state.rs index e30f703ae..00886b89c 100644 --- a/ethcore/src/state.rs +++ b/ethcore/src/state.rs @@ -153,12 +153,12 @@ impl State { /// Get the balance of account `a`. pub fn balance(&self, a: &Address) -> U256 { - self.get(a, false).as_ref().map_or(U256::zero(), |account| account.balance().clone()) + self.get(a, false).as_ref().map_or(U256::zero(), |account| *account.balance()) } /// Get the nonce of account `a`. pub fn nonce(&self, a: &Address) -> U256 { - self.get(a, false).as_ref().map_or(U256::zero(), |account| account.nonce().clone()) + self.get(a, false).as_ref().map_or(U256::zero(), |account| *account.nonce()) } /// Mutate storage of account `address` so that it is `value` for `key`. diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 66688466c..c506d44b3 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -9,13 +9,13 @@ authors = ["Ethcore { + self.last_imported_block = Some(header.number); trace!(target: "sync", "New block queued {:?}", h); }, Err(ImportError::UnknownParent) => { diff --git a/sync/src/range_collection.rs b/sync/src/range_collection.rs index c70bac4ca..a07f85a7f 100644 --- a/sync/src/range_collection.rs +++ b/sync/src/range_collection.rs @@ -40,7 +40,7 @@ pub trait RangeCollection { fn get_tail(&mut self, key: &K) -> Range; /// Remove all elements < `start` in the range that contains `start` - 1 fn remove_head(&mut self, start: &K); - /// Remove all elements >= `start` in the range that contains `start` + /// Remove all elements >= `start` in the range that contains `start` fn remove_tail(&mut self, start: &K); /// Remove all elements >= `tail` fn insert_item(&mut self, key: K, value: V); @@ -168,6 +168,7 @@ impl RangeCollection for Vec<(K, Vec)> where K: Ord + PartialEq + fn insert_item(&mut self, key: K, value: V) { assert!(!self.have_item(&key)); + // todo: fix warning let lower = match self.binary_search_by(|&(k, _)| k.cmp(&key).reverse()) { Ok(index) => index, Err(index) => index, diff --git a/util/Cargo.toml b/util/Cargo.toml index 733b08701..b1e9bbc1e 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -26,7 +26,7 @@ crossbeam = "0.2" slab = { git = "https://github.com/arkpar/slab.git" } sha3 = { path = "sha3" } serde = "0.6.7" -clippy = "0.0.37" +clippy = "0.0.41" json-tests = { path = "json-tests" } target_info = "0.1.0" igd = "0.4.2" diff --git a/util/benches/trie.rs b/util/benches/trie.rs index 2c07dbc08..8c573e170 100644 --- a/util/benches/trie.rs +++ b/util/benches/trie.rs @@ -17,7 +17,6 @@ #![feature(test)] extern crate test; -extern crate rand; extern crate ethcore_util; #[macro_use] extern crate log; diff --git a/util/src/crypto.rs b/util/src/crypto.rs index 405646887..596265cd0 100644 --- a/util/src/crypto.rs +++ b/util/src/crypto.rs @@ -74,7 +74,6 @@ impl From<::secp256k1::Error> for CryptoError { match e { ::secp256k1::Error::InvalidMessage => CryptoError::InvalidMessage, ::secp256k1::Error::InvalidPublicKey => CryptoError::InvalidPublic, - ::secp256k1::Error::InvalidSignature => CryptoError::InvalidSignature, ::secp256k1::Error::InvalidSecretKey => CryptoError::InvalidSecret, _ => CryptoError::InvalidSignature, } diff --git a/util/src/hash.rs b/util/src/hash.rs index c678d13a7..3e164098b 100644 --- a/util/src/hash.rs +++ b/util/src/hash.rs @@ -290,7 +290,7 @@ macro_rules! impl_hash { try!(write!(f, "{:02x}", i)); } try!(write!(f, "…")); - for i in &self.0[$size - 4..$size] { + for i in &self.0[$size - 2..$size] { try!(write!(f, "{:02x}", i)); } Ok(()) @@ -641,7 +641,7 @@ mod tests { fn hash() { let h = H64([0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef]); assert_eq!(H64::from_str("0123456789abcdef").unwrap(), h); - assert_eq!(format!("{}", h), "0123…89abcdef"); + assert_eq!(format!("{}", h), "0123…cdef"); assert_eq!(format!("{:?}", h), "0123456789abcdef"); assert_eq!(h.hex(), "0123456789abcdef"); assert!(h == h); diff --git a/util/src/network/session.rs b/util/src/network/session.rs index f501e9c79..5cda00567 100644 --- a/util/src/network/session.rs +++ b/util/src/network/session.rs @@ -335,7 +335,7 @@ impl Session { let mut rlp = RlpStream::new(); rlp.append(&(PACKET_DISCONNECT as u32)); rlp.begin_list(1); - rlp.append(&(reason.clone() as u32)); + rlp.append(&(reason as u32)); self.connection.send_packet(&rlp.out()).ok(); NetworkError::Disconnect(reason) } diff --git a/util/src/rlp/untrusted_rlp.rs b/util/src/rlp/untrusted_rlp.rs index 7126e868d..463d5cb2f 100644 --- a/util/src/rlp/untrusted_rlp.rs +++ b/util/src/rlp/untrusted_rlp.rs @@ -408,7 +408,7 @@ impl Decodable for Vec { fn decode(decoder: &D) -> Result where D: Decoder { decoder.read_value(| bytes | { let mut res = vec![]; - res.extend(bytes); + res.extend_from_slice(bytes); Ok(res) }) } diff --git a/util/src/trie/triedb.rs b/util/src/trie/triedb.rs index b6cc81137..e7884a177 100644 --- a/util/src/trie/triedb.rs +++ b/util/src/trie/triedb.rs @@ -293,7 +293,7 @@ impl<'a> Iterator for TrieDBIterator<'a> { fn next(&mut self) -> Option { let b = match self.trail.last_mut() { - Some(ref mut b) => { b.increment(); b.clone() }, + Some(mut b) => { b.increment(); b.clone() }, None => return None }; match (b.status, b.node) { @@ -309,9 +309,8 @@ impl<'a> Iterator for TrieDBIterator<'a> { self.trail.pop(); self.next() }, - (Status::At, Node::Leaf(_, v)) => Some((self.key(), v)), + (Status::At, Node::Leaf(_, v)) | (Status::At, Node::Branch(_, Some(v))) => Some((self.key(), v)), (Status::At, Node::Extension(_, d)) => self.descend_next(d), - (Status::At, Node::Branch(_, Some(v))) => Some((self.key(), v)), (Status::At, Node::Branch(_, _)) => self.next(), (Status::AtChild(i), Node::Branch(children, _)) if children[i].len() > 0 => { match i {