From eb2b1ad5daf93453e82092761a7c60da4ae6a465 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Tue, 3 Jan 2017 16:43:22 +0100
Subject: [PATCH] move basic_account to types module

---
 ethcore/src/state/account.rs       | 36 +------------------
 ethcore/src/state/mod.rs           |  2 +-
 ethcore/src/types/basic_account.rs | 55 ++++++++++++++++++++++++++++++
 ethcore/src/types/mod.rs.in        |  1 +
 4 files changed, 58 insertions(+), 36 deletions(-)
 create mode 100644 ethcore/src/types/basic_account.rs

diff --git a/ethcore/src/state/account.rs b/ethcore/src/state/account.rs
index 9d6b58d0e..63e8ff9de 100644
--- a/ethcore/src/state/account.rs
+++ b/ethcore/src/state/account.rs
@@ -20,46 +20,12 @@ use util::*;
 use pod_account::*;
 use rlp::*;
 use lru_cache::LruCache;
+use basic_account::BasicAccount;
 
 use std::cell::{RefCell, Cell};
 
 const STORAGE_CACHE_ITEMS: usize = 8192;
 
-/// Basic account type.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct BasicAccount {
-	/// Nonce of the account.
-	pub nonce: U256,
-	/// Balance of the account.
-	pub balance: U256,
-	/// Storage root of the account.
-	pub storage_root: H256,
-	/// Code hash of the account.
-	pub code_hash: H256,
-}
-
-impl Encodable for BasicAccount {
-	fn rlp_append(&self, s: &mut RlpStream) {
-		s.begin_list(4)
-			.append(&self.nonce)
-			.append(&self.balance)
-			.append(&self.storage_root)
-			.append(&self.code_hash);
-	}
-}
-
-impl Decodable for BasicAccount {
-	fn decode<D>(decoder: &D) -> Result<Self, DecoderError> where D: Decoder {
-		let rlp = decoder.as_rlp();
-		Ok(BasicAccount {
-			nonce: rlp.val_at(0)?,
-			balance: rlp.val_at(1)?,
-			storage_root: rlp.val_at(2)?,
-			code_hash: rlp.val_at(3)?,
-		})
-	}
-}
-
 /// Single account in the system.
 /// Keeps track of changes to the code and storage.
 /// The changes are applied in `commit_storage` and `commit_code`
diff --git a/ethcore/src/state/mod.rs b/ethcore/src/state/mod.rs
index 1dcc37732..c9730c1c3 100644
--- a/ethcore/src/state/mod.rs
+++ b/ethcore/src/state/mod.rs
@@ -37,7 +37,7 @@ use util::trie::recorder::{Recorder, BasicRecorder as TrieRecorder};
 mod account;
 mod substate;
 
-pub use self::account::{BasicAccount, Account};
+pub use self::account::Account;
 pub use self::substate::Substate;
 
 /// Used to return information about an `State::apply` operation.
diff --git a/ethcore/src/types/basic_account.rs b/ethcore/src/types/basic_account.rs
new file mode 100644
index 000000000..18adbc944
--- /dev/null
+++ b/ethcore/src/types/basic_account.rs
@@ -0,0 +1,55 @@
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity 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 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.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Basic account type -- the decoded RLP from the state trie.
+
+use rlp::*;
+use util::{U256, H256};
+
+/// Basic account type.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct BasicAccount {
+	/// Nonce of the account.
+	pub nonce: U256,
+	/// Balance of the account.
+	pub balance: U256,
+	/// Storage root of the account.
+	pub storage_root: H256,
+	/// Code hash of the account.
+	pub code_hash: H256,
+}
+
+impl Encodable for BasicAccount {
+	fn rlp_append(&self, s: &mut RlpStream) {
+		s.begin_list(4)
+			.append(&self.nonce)
+			.append(&self.balance)
+			.append(&self.storage_root)
+			.append(&self.code_hash);
+	}
+}
+
+impl Decodable for BasicAccount {
+	fn decode<D>(decoder: &D) -> Result<Self, DecoderError> where D: Decoder {
+		let rlp = decoder.as_rlp();
+		Ok(BasicAccount {
+			nonce: rlp.val_at(0)?,
+			balance: rlp.val_at(1)?,
+			storage_root: rlp.val_at(2)?,
+			code_hash: rlp.val_at(3)?,
+		})
+	}
+}
diff --git a/ethcore/src/types/mod.rs.in b/ethcore/src/types/mod.rs.in
index 567c6fff9..12081d1fb 100644
--- a/ethcore/src/types/mod.rs.in
+++ b/ethcore/src/types/mod.rs.in
@@ -37,3 +37,4 @@ pub mod mode;
 pub mod pruning_info;
 pub mod security_level;
 pub mod encoded;
+pub mod basic_account;