grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed redundant PodAccount::new method (#7928)

Browse Source 
* removed redundant PodAccount::new method

* fixed failing test
This commit is contained in:
Marek Kotewicz 2018-02-19 10:58:04 +01:00 committed by GitHub
parent b77771171d
commit 4bda6efed0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ethcore/src/pod_account.rs
View File

@ -43,12 +43,6 @@ pub struct PodAccount {
} }
impl 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. /// Convert Account to a PodAccount.
/// NOTE: This will silently fail unless the account is fully cached. /// NOTE: This will silently fail unless the account is fully cached.
pub fn from_account(acc: &Account) -> PodAccount { pub fn from_account(acc: &Account) -> PodAccount {

56
ethcore/src/pod_state.rs
View File

@ -89,7 +89,12 @@ mod test {
#[test] #[test]
fn create_delete() { 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![ assert_eq!(super::diff_pod(&a, &PodState::new()), StateDiff { raw: map![
1.into() => AccountDiff{ 1.into() => AccountDiff{
balance: Diff::Died(69.into()), balance: Diff::Died(69.into()),
@ -110,10 +115,25 @@ mod test {
#[test] #[test]
fn create_delete_with_unchanged() { 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![ let b = PodState::from(map![
1.into() => PodAccount::new(69.into(), 0.into(), vec![], map![]), 1.into() => PodAccount {
2.into() => PodAccount::new(69.into(), 0.into(), vec![], map![]) 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![ assert_eq!(super::diff_pod(&a, &b), StateDiff { raw: map![
2.into() => AccountDiff{ 2.into() => AccountDiff{
@ -136,12 +156,32 @@ mod test {
#[test] #[test]
fn change_with_unchanged() { fn change_with_unchanged() {
let a = PodState::from(map![ let a = PodState::from(map![
1.into() => PodAccount::new(69.into(), 0.into(), vec![], map![]), 1.into() => PodAccount {
2.into() => PodAccount::new(69.into(), 0.into(), vec![], map![]) 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![ let b = PodState::from(map![
1.into() => PodAccount::new(69.into(), 1.into(), vec![], map![]), 1.into() => PodAccount {
2.into() => PodAccount::new(69.into(), 0.into(), vec![], map![]) 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![ assert_eq!(super::diff_pod(&a, &b), StateDiff { raw: map![
1.into() => AccountDiff{ 1.into() => AccountDiff{