Merge branch 'master' into sync

chain/src/block.rs

@@ -6,7 +6,7 @@ use ser::{
 };
 use merkle_root::merkle_root;
 use {BlockHeader, Transaction};
-use super::RepresetH256;
+use super::RepresentH256;
 
 #[derive(Debug, PartialEq, Clone)]
 pub struct Block {
@@ -39,7 +39,7 @@ impl From<&'static str> for Block {
 	}
 }
 
-impl RepresetH256 for Block {
+impl RepresentH256 for Block {
 	fn hash(&self) -> H256 {
 		self.block_header.hash()
 	}
@@ -69,7 +69,7 @@ impl Block {
 mod tests {
 	use hash::H256;
 	use super::Block;
-	use super::super::RepresetH256;
+	use super::super::RepresentH256;
 
 	// Block 80000
 	// https://blockchain.info/rawblock/000000000043a8c0fd1d6f726790caa2a406010d19efd2780db27bdbbd93baf6

chain/src/lib.rs

@@ -9,7 +9,7 @@ mod block_header;
 mod merkle_root;
 mod transaction;
 
-pub trait RepresetH256 {
+pub trait RepresentH256 {
 	fn hash(&self) -> primitives::hash::H256;
 }
 

db/src/storage.rs

@@ -8,7 +8,7 @@ use primitives::hash::H256;
 use primitives::bytes::Bytes;
 use super::BlockRef;
 use serialization;
-use chain::{self, RepresetH256};
+use chain::{self, RepresentH256};
 
 const COL_COUNT: u32 = 10;
 const COL_META: u32 = 0;
@@ -263,7 +263,7 @@ mod tests {
 
 	use super::{Storage, Store};
 	use devtools::RandomTempPath;
-	use chain::{Block, RepresetH256};
+	use chain::{Block, RepresentH256};
 	use super::super::BlockRef;
 	use test_data;
 

db/src/test_storage.rs

@@ -1,7 +1,7 @@
 //! Test storage
 
 use super::{BlockRef, Store, Error};
-use chain::{self, RepresetH256};
+use chain::{self, RepresentH256};
 use primitives::hash::H256;
 use serialization;
 use chain::bytes::Bytes;

sync/src/local_chain.rs

@@ -1,5 +1,5 @@
 use std::collections::HashMap;
-use chain::{Block, RepresetH256};
+use chain::{Block, RepresentH256};
 use primitives::hash::H256;
 use best_block::BestBlock;
 

verification/src/chain_verifier.rs

@@ -3,7 +3,7 @@
 use std::sync::Arc;
 
 use db::{self, BlockRef};
-use chain::{self, RepresetH256};
+use chain::{self, RepresentH256};
 use super::{Verify, VerificationResult, Chain, Error, TransactionError};
 use utils;
 

verification/src/queue.rs

@@ -1,6 +1,6 @@
 //! Blocks verification queue
 
-use chain::{Block, RepresetH256};
+use chain::{Block, RepresentH256};
 use primitives::hash::H256;
 use super::{Chain, Verify, BlockStatus};
 use linked_hash_map::LinkedHashMap;
@@ -119,7 +119,7 @@ impl Queue {
 mod tests {
 	use super::Queue;
 	use super::super::{BlockStatus, VerificationResult, Verify, Chain, Error as VerificationError};
-	use chain::{Block, RepresetH256};
+	use chain::{Block, RepresentH256};
 	use primitives::hash::H256;
 	use test_data;