From 4bda6efed05d6bc37bffb21c24f9f7eded321152 Mon Sep 17 00:00:00 2001
From: Marek Kotewicz <marek.kotewicz@gmail.com>
Date: Mon, 19 Feb 2018 10:58:04 +0100
Subject: [PATCH] removed redundant PodAccount::new method (#7928)

* removed redundant PodAccount::new method

* fixed failing test
---
 ethcore/src/pod_account.rs |  6 ----
 ethcore/src/pod_state.rs   | 56 ++++++++++++++++++++++++++++++++------
 2 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/ethcore/src/pod_account.rs b/ethcore/src/pod_account.rs
index 7af9fbc06..027e2765f 100644
--- a/ethcore/src/pod_account.rs
+++ b/ethcore/src/pod_account.rs
@@ -43,12 +43,6 @@ pub struct PodAccount {
 }
 
 impl PodAccount {
-	/// Construct new object.
-	#[cfg(test)]
-	pub fn new(balance: U256, nonce: U256, code: Bytes, storage: BTreeMap<H256, H256>) -> PodAccount {
-		PodAccount { balance: balance, nonce: nonce, code: Some(code), storage: storage }
-	}
-
 	/// Convert Account to a PodAccount.
 	/// NOTE: This will silently fail unless the account is fully cached.
 	pub fn from_account(acc: &Account) -> PodAccount {
diff --git a/ethcore/src/pod_state.rs b/ethcore/src/pod_state.rs
index f626c72d7..2bb7a3522 100644
--- a/ethcore/src/pod_state.rs
+++ b/ethcore/src/pod_state.rs
@@ -89,7 +89,12 @@ mod test {
 
 	#[test]
 	fn create_delete() {
-		let a = PodState::from(map![ 1.into() => PodAccount::new(69.into(), 0.into(), vec![], 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()),
@@ -110,10 +115,25 @@ mod test {
 
 	#[test]
 	fn create_delete_with_unchanged() {
-		let a = PodState::from(map![ 1.into() => PodAccount::new(69.into(), 0.into(), vec![], 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::new(69.into(), 0.into(), vec![], map![]),
-			2.into() => PodAccount::new(69.into(), 0.into(), vec![], map![])
+			1.into() => PodAccount {
+				balance: 69.into(),
+				nonce: 0.into(),
+				code: Some(Vec::new()),
+				storage: map![],
+			},
+			2.into() => PodAccount {
+				balance: 69.into(),
+				nonce: 0.into(),
+				code: Some(Vec::new()),
+				storage: map![],
+			}
 		]);
 		assert_eq!(super::diff_pod(&a, &b), StateDiff { raw: map![
 			2.into() => AccountDiff{
@@ -136,12 +156,32 @@ mod test {
 	#[test]
 	fn change_with_unchanged() {
 		let a = PodState::from(map![
-			1.into() => PodAccount::new(69.into(), 0.into(), vec![], map![]),
-			2.into() => PodAccount::new(69.into(), 0.into(), vec![], map![])
+			1.into() => PodAccount {
+				balance: 69.into(),
+				nonce: 0.into(),
+				code: Some(Vec::new()),
+				storage: map![],
+			},
+			2.into() => PodAccount {
+				balance: 69.into(),
+				nonce: 0.into(),
+				code: Some(Vec::new()),
+				storage: map![],
+			}
 		]);
 		let b = PodState::from(map![
-			1.into() => PodAccount::new(69.into(), 1.into(), vec![], map![]),
-			2.into() => PodAccount::new(69.into(), 0.into(), vec![], map![])
+			1.into() => PodAccount {
+				balance: 69.into(),
+				nonce: 1.into(),
+				code: Some(Vec::new()),
+				storage: map![],
+			},
+			2.into() => PodAccount {
+				balance: 69.into(),
+				nonce: 0.into(),
+				code: Some(Vec::new()),
+				storage: map![],
+			}
 		]);
 		assert_eq!(super::diff_pod(&a, &b), StateDiff { raw: map![
 			1.into() => AccountDiff{