diff --git a/ethcore/src/blockchain/blockchain.rs b/ethcore/src/blockchain/blockchain.rs index 8b120caa2..30bd7a5b1 100644 --- a/ethcore/src/blockchain/blockchain.rs +++ b/ethcore/src/blockchain/blockchain.rs @@ -570,9 +570,9 @@ impl BlockChain { if let BlockLocation::BranchBecomingCanonChain(ref d) = info.location { info!(target: "reorg", "Reorg to {} ({} {} {})", Colour::Yellow.bold().paint(format!("#{} {}", info.number, info.hash)), - Colour::Red.paint(d.retracted.iter().fold(String::new(), |acc, h| format!("{} {}", acc, h))), - Colour::White.paint(format!("#{} {}", d.ancestor, self.block_details(&d.ancestor).expect("`ancestor` is in the route; qed").number)), - Colour::Green.paint(d.enacted.iter().fold(String::new(), |acc, h| format!("{} {}", acc, h))) + Colour::Red.paint(d.retracted.iter().join(" ")), + Colour::White.paint(format!("#{} {}", self.block_details(&d.ancestor).expect("`ancestor` is in the route; qed").number, d.ancestor)), + Colour::Green.paint(d.enacted.iter().join(" ")) ); } diff --git a/parity/cli.rs b/parity/cli.rs index 11d58eb22..eeab2563a 100644 --- a/parity/cli.rs +++ b/parity/cli.rs @@ -48,8 +48,8 @@ Operating Options: [default: 3600]. --chain CHAIN Specify the blockchain type. CHAIN may be either a JSON chain specification file or olympic, frontier, - homestead, mainnet, morden, homestead-dogmatic, or - testnet [default: homestead]. + homestead, mainnet, morden, classic or testnet + [default: homestead]. -d --db-path PATH Specify the database & configuration directory path [default: $HOME/.parity]. --keys-path PATH Specify the path for JSON key files to be found