Merge branch 'master' into new-jsonrpc

2017-03-21 09:35:50 +01:00
parent 1d87f24715 badb3729c9
commit 958a8f66a0
70 changed files with 859 additions and 848 deletions
--- a/ipfs/src/route.rs
+++ b/ipfs/src/route.rs
@@ -79,7 +79,7 @@ impl IpfsHandler {
 	fn block_list(&self, hash: H256) -> Result<Out> {
 		let uncles = self.client().find_uncles(&hash).ok_or(Error::BlockNotFound)?;

-		Ok(Out::OctetStream(rlp::encode(&uncles).to_vec()))
+		Ok(Out::OctetStream(rlp::encode_list(&uncles).to_vec()))
 	}

 	/// Get transaction by hash and return as raw binary.