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

Fix checkpointing when creating contract failed (#9514)

Browse Source
This commit is contained in:
Wei Tang 2018-09-11 16:28:31 +08:00 committed by Afri Schoedon
parent 485870296d
commit 631df0fe56
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ethcore/src/state/mod.rs
View File

@ -421,16 +421,7 @@ impl<B: Backend> State<B> {
**prev = checkpoint; **prev = checkpoint;
} else { } else {
for (k, v) in checkpoint.drain() { for (k, v) in checkpoint.drain() {
match prev.entry(k) { prev.entry(k).or_insert(v);
Entry::Occupied(mut e) => {
if e.get().is_none() {
e.insert(v);
}
},
Entry::Vacant(e) => {
e.insert(v);
}
}
} }
} }
} }
@ -2462,6 +2453,25 @@ mod tests {
assert_eq!(state.storage_at(&a, &k).unwrap(), H256::from(U256::from(1))); assert_eq!(state.storage_at(&a, &k).unwrap(), H256::from(U256::from(1)));
} }
#[test]
fn create_contract_fail() {
let mut state = get_temp_state();
let orig_root = state.root().clone();
let a: Address = 1000.into();
state.checkpoint(); // c1
state.new_contract(&a, U256::zero(), U256::zero()).unwrap();
state.add_balance(&a, &U256::from(1), CleanupMode::ForceCreate).unwrap();
state.checkpoint(); // c2
state.add_balance(&a, &U256::from(1), CleanupMode::ForceCreate).unwrap();
state.discard_checkpoint(); // discard c2
state.revert_to_checkpoint(); // revert to c1
assert_eq!(state.exists(&a).unwrap(), false);
state.commit().unwrap();
assert_eq!(orig_root, state.root().clone());
}
#[test] #[test]
fn create_empty() { fn create_empty() {
let mut state = get_temp_state(); let mut state = get_temp_state();