Merge branch 'split_hash' into move_hash

2016-08-05 09:56:36 +02:00
parent 1ed2de1d9b 24c7392500
commit df29fcff1a
5 changed files with 17 additions and 39 deletions
--- a/ethcore/src/state.rs
+++ b/ethcore/src/state.rs
@@ -1393,7 +1393,7 @@ fn alter_balance() {
 	let mut state_result = get_temp_state();
 	let mut state = state_result.reference_mut();
 	let a = Address::zero();
-	let b = address_from_u64(1u64);
+	let b = 1u64.into();
 	state.add_balance(&a, &U256::from(69u64));
 	assert_eq!(state.balance(&a), U256::from(69u64));
 	state.commit().unwrap();