From c7b359fcee93814da64388240bbf88447f51bcab Mon Sep 17 00:00:00 2001 From: arkpar Date: Sun, 27 Nov 2016 18:26:23 +0100 Subject: [PATCH] Style --- ethcore/src/client/client.rs | 1 - parity/blockchain.rs | 15 +++++++-------- util/src/trie/triedb.rs | 3 +-- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs index 9a2e05cf1..11fff936f 100644 --- a/ethcore/src/client/client.rs +++ b/ethcore/src/client/client.rs @@ -173,7 +173,6 @@ impl Client { }; let trie_factory = TrieFactory::new(trie_spec); - let journal_db = journaldb::new(db.clone(), config.pruning, ::db::COL_STATE); let mut state_db = StateDB::new(journal_db, config.state_cache_size); if state_db.journal_db().is_empty() && try!(spec.ensure_db_good(&mut state_db, &trie_factory)) { diff --git a/parity/blockchain.rs b/parity/blockchain.rs index bc0509cb5..528a56d3a 100644 --- a/parity/blockchain.rs +++ b/parity/blockchain.rs @@ -335,19 +335,18 @@ fn start_client( let client_config = to_client_config(&cache_config, Mode::Active, tracing, fat_db, compaction, wal, VMType::default(), "".into(), algorithm, pruning_history, true); let service = try!(ClientService::start( - client_config, - &spec, - &client_path, - &snapshot_path, - &dirs.ipc_path(), - Arc::new(Miner::with_spec(&spec)), - ).map_err(|e| format!("Client service error: {:?}", e))); + client_config, + &spec, + &client_path, + &snapshot_path, + &dirs.ipc_path(), + Arc::new(Miner::with_spec(&spec)), + ).map_err(|e| format!("Client service error: {:?}", e))); drop(spec); Ok(service) } - fn execute_export(cmd: ExportBlockchain) -> Result { // Setup panic handler let service = try!(start_client(cmd.dirs, cmd.spec, cmd.pruning, cmd.pruning_history, cmd.tracing, cmd.fat_db, cmd.compaction, cmd.wal, cmd.cache_config)); diff --git a/util/src/trie/triedb.rs b/util/src/trie/triedb.rs index ac150ef1a..ecd8bdded 100644 --- a/util/src/trie/triedb.rs +++ b/util/src/trie/triedb.rs @@ -304,14 +304,13 @@ impl<'a> TrieDBIterator<'a> { status: Status::At, node: Node::decoded(node), }); - self.key_nibbles.extend(slice.iter()); } else { self.trail.push(Crumb { status: Status::Exiting, node: Node::decoded(node), }); - self.key_nibbles.extend(slice.iter()); } + self.key_nibbles.extend(slice.iter()); Ok(()) }, Node::Extension(ref slice, ref item) => {