merge with master

2016-09-01 15:07:06 +02:00
parent 74ffcff99c 9a5668f802
commit bb6243c550
64 changed files with 718 additions and 724 deletions
--- a/ethcore/src/state/account.rs
+++ b/ethcore/src/state/account.rs
@@ -288,7 +288,7 @@ impl Account {
 				// so we can call overloaded `to_bytes` method
 				let res = match v.is_zero() {
 					true => t.remove(k),
-					false => t.insert(k, &encode(&U256::from(v.as_slice()))),
+					false => t.insert(k, &encode(&U256::from(&*v))),
 				};

 				if let Err(e) = res {