Merge with master

2017-08-02 17:24:34 +02:00
parent 2e840bc89c 0c7c34e609
commit 01ea968d4f
158 changed files with 14603 additions and 959 deletions
--- a/json/src/spec/tendermint.rs
+++ b/json/src/spec/tendermint.rs
@@ -49,6 +49,7 @@ pub struct Tendermint {
 mod tests {
 	use serde_json;
 	use bigint::prelude::H160;
+	use hash::Address;
 	use spec::tendermint::Tendermint;
 	use spec::validator_set::ValidatorSet;