From 9fec2142ae96f1ff75a6c71581bc92a9cd35da90 Mon Sep 17 00:00:00 2001
From: Marek Kotewicz <marek.kotewicz@gmail.com>
Date: Tue, 27 Feb 2018 18:37:36 +0100
Subject: [PATCH] clean up account fmt::Debug (#7983)

---
 ethcore/src/pod_state.rs     | 35 ++++++++++++++++++++++-------------
 ethcore/src/state/account.rs |  9 +++++++--
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/ethcore/src/pod_state.rs b/ethcore/src/pod_state.rs
index 2bb7a3522..1bbabc980 100644
--- a/ethcore/src/pod_state.rs
+++ b/ethcore/src/pod_state.rs
@@ -76,7 +76,12 @@ impl fmt::Display for PodState {
 
 /// Calculate and return diff between `pre` state and `post` state.
 pub fn diff_pod(pre: &PodState, post: &PodState) -> StateDiff {
-	StateDiff { raw: pre.get().keys().merge(post.get().keys()).filter_map(|acc| pod_account::diff_pod(pre.get().get(acc), post.get().get(acc)).map(|d|(acc.clone(), d))).collect() }
+	StateDiff {
+		raw: pre.get().keys()
+			.merge(post.get().keys())
+			.filter_map(|acc| pod_account::diff_pod(pre.get().get(acc), post.get().get(acc)).map(|d| (acc.clone(), d)))
+			.collect()
+	}
 }
 
 #[cfg(test)]
@@ -89,12 +94,14 @@ mod test {
 
 	#[test]
 	fn create_delete() {
-		let a = PodState::from(map![ 1.into() => PodAccount {
-			balance: 69.into(),
-			nonce: 0.into(),
-			code: Some(Vec::new()),
-			storage: map![],
-		}]);
+		let a = PodState::from(map![
+			1.into() => PodAccount {
+				balance: 69.into(),
+				nonce: 0.into(),
+				code: Some(Vec::new()),
+				storage: map![],
+			}
+		]);
 		assert_eq!(super::diff_pod(&a, &PodState::new()), StateDiff { raw: map![
 			1.into() => AccountDiff{
 				balance: Diff::Died(69.into()),
@@ -115,12 +122,14 @@ mod test {
 
 	#[test]
 	fn create_delete_with_unchanged() {
-		let a = PodState::from(map![ 1.into() => PodAccount {
-			balance: 69.into(),
-			nonce: 0.into(),
-			code: Some(Vec::new()),
-			storage: map![],
-		}]);
+		let a = PodState::from(map![
+			1.into() => PodAccount {
+				balance: 69.into(),
+				nonce: 0.into(),
+				code: Some(Vec::new()),
+				storage: map![],
+			}
+		]);
 		let b = PodState::from(map![
 			1.into() => PodAccount {
 				balance: 69.into(),
diff --git a/ethcore/src/state/account.rs b/ethcore/src/state/account.rs
index 27917ad7b..da4902454 100644
--- a/ethcore/src/state/account.rs
+++ b/ethcore/src/state/account.rs
@@ -18,7 +18,7 @@
 
 use std::fmt;
 use std::sync::Arc;
-use std::collections::HashMap;
+use std::collections::{HashMap, BTreeMap};
 use hash::{KECCAK_EMPTY, KECCAK_NULL_RLP, keccak};
 use ethereum_types::{H256, U256, Address};
 use hashdb::HashDB;
@@ -479,7 +479,12 @@ impl Account {
 
 impl fmt::Debug for Account {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		write!(f, "{:?}", PodAccount::from_account(self))
+		f.debug_struct("Account")
+			.field("balance", &self.balance)
+			.field("nonce", &self.nonce)
+			.field("code", &self.code())
+			.field("storage", &self.storage_changes.iter().collect::<BTreeMap<_, _>>())
+			.finish()
 	}
 }