diff --git a/ethcore/src/block.rs b/ethcore/src/block.rs index 70154c5b6a3..6afca5455bb 100644 --- a/ethcore/src/block.rs +++ b/ethcore/src/block.rs @@ -553,7 +553,7 @@ pub fn enact( let root = s.as_ref().unwrap().root(); let author_balance = s.as_ref().unwrap().balance(&env.author)?; trace!(target: "enact", "num={}, root={}, author={}, author_balance={}\n", - b.block.header.number(), root, env.author, author_balance); + b.block.header.number(), root, env.author, author_balance); } b.push_transactions(transactions)?; diff --git a/ethcore/src/engines/clique/block_state.rs b/ethcore/src/engines/clique/block_state.rs index c4f874b8dee..e5e33ede06e 100644 --- a/ethcore/src/engines/clique/block_state.rs +++ b/ethcore/src/engines/clique/block_state.rs @@ -26,7 +26,6 @@ use engines::clique::util::{extract_signers, recover_creator}; use error::Error; use types::header::Header; - #[derive(Clone, Debug)] pub struct CliqueBlockState { pub votes: HashMap<(Address, Address), VoteType>, // k: (Voter, beneficiary), VoteType) @@ -58,18 +57,18 @@ impl CliqueBlockState { if !self.signers.contains(&creator) { trace!(target: "engine", "current state: {:?}", self); return Err(From::from(format!("Error applying #{}({}): {} is not in the signer list!", - header.number(), - header.hash(), - creator))); + header.number(), + header.hash(), + creator))); } // Check recent signer. if self.recent_signers.contains(&creator) { trace!(target: "engine", "current state: {:?}", self); return Err(From::from(format!("Error applying #{}({}): {} is in the recent_signer list!", - header.number(), - header.hash(), - creator))); + header.number(), + header.hash(), + creator))); } // Ensure that the difficulty corresponds to the turn-ness of the signer @@ -78,8 +77,8 @@ impl CliqueBlockState { if (inturn && *header.difficulty() != DIFF_INTURN) || (!inturn && *header.difficulty() != DIFF_NOTURN) { return Err(From::from(format!("Error applying #{}({}): wrong difficulty!", - header.number(), - header.hash()))); + header.number(), + header.hash()))); } Ok(creator) diff --git a/ethcore/src/engines/clique/mod.rs b/ethcore/src/engines/clique/mod.rs index b52ecd2b471..00b12c89763 100644 --- a/ethcore/src/engines/clique/mod.rs +++ b/ethcore/src/engines/clique/mod.rs @@ -252,8 +252,8 @@ impl Clique { // for speed. let backfill_start = time::Instant::now(); info!(target: "engine", - "Back-filling block state. last_checkpoint_number: {}, target: {}({}).", - last_checkpoint_number, header.number(), header.hash()); + "Back-filling block state. last_checkpoint_number: {}, target: {}({}).", + last_checkpoint_number, header.number(), header.hash()); // Get the state for last checkpoint. let last_checkpoint_hash = *(chain.front().ok_or( @@ -284,8 +284,8 @@ impl Clique { let elapsed = backfill_start.elapsed(); info!(target: "engine", - "Back-filling succeed, took {} ms.", - elapsed.as_secs() * 1000 + elapsed.subsec_millis() as u64, + "Back-filling succeed, took {} ms.", + elapsed.as_secs() * 1000 + elapsed.subsec_millis() as u64, ); Ok(new_state) @@ -430,7 +430,7 @@ impl Engine for Clique { match self.state(&parent) { Err(e) => { warn!(target: "engine", "generate_seal: can't get parent state(number: {}, hash: {}): {} ", - parent.number(), parent.hash(), e); + parent.number(), parent.hash(), e); return Seal::None; } Ok(state) => { @@ -454,8 +454,8 @@ impl Engine for Clique { // Wait for the right moment. if now < limit { trace!(target: "engine", - "generate_seal: sleeping to sign: inturn: {}, now: {:?}, to: {:?}.", - inturn, now, limit); + "generate_seal: sleeping to sign: inturn: {}, now: {:?}, to: {:?}.", + inturn, now, limit); match limit.duration_since(SystemTime::now()) { Ok(duration) => { thread::sleep(duration); @@ -468,7 +468,7 @@ impl Engine for Clique { } trace!(target: "engine", "generate_seal: seal ready for block {}, txs: {}.", - block.header.number(), block.transactions.len()); + block.header.number(), block.transactions.len()); return Seal::Regular(null_seal); } } diff --git a/ethcore/src/engines/clique/util.rs b/ethcore/src/engines/clique/util.rs index d5e38f8685e..59a5aafda8b 100644 --- a/ethcore/src/engines/clique/util.rs +++ b/ethcore/src/engines/clique/util.rs @@ -1,3 +1,19 @@ +// Copyright 2015-2019 Parity Technologies (UK) Ltd. +// This file is part of Parity Ethereum. + +// Parity Ethereum is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity Ethereum is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity Ethereum. If not, see . + use ethereum_types::{Address, H256}; use lru_cache::LruCache; use parking_lot::RwLock; @@ -42,7 +58,6 @@ pub fn recover_creator(header: &Header) -> Result { Ok(creator) } - /// Extract signer list from extra_data. /// /// Layout of extra_data: diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs index cb2991d5b67..b62b220b603 100644 --- a/ethcore/src/miner/miner.rs +++ b/ethcore/src/miner/miner.rs @@ -214,7 +214,6 @@ impl Author { } } - struct SealingWork { queue: UsingQueue, enabled: bool, @@ -1143,7 +1142,7 @@ impl miner::MinerService for Miner { if block.block().header().number() == 1 { if let Some(name) = self.engine.params().nonzero_bugfix_hard_fork() { warn!("Your chain specification contains one or more hard forks which are required to be \ - on by default. Please remove these forks and start your chain again: {}.", name); + on by default. Please remove these forks and start your chain again: {}.", name); return; } } diff --git a/scripts/gitlab/sign-win.cmd b/scripts/gitlab/sign-win.cmd old mode 100644 new mode 100755