Merge branch 'master' into auth-bft

2016-12-05 16:37:35 +00:00
parent 4f857642b5 a726472023
commit 6fc943ca6d
16 changed files with 31 additions and 31 deletions
--- a/sync/src/api.rs
+++ b/sync/src/api.rs
@@ -47,7 +47,7 @@ pub struct SyncConfig {
 	/// Enable ancient block download.
 	pub download_old_blocks: bool,
 	/// Network ID
-	pub network_id: usize,
+	pub network_id: u64,
 	/// Main "eth" subprotocol name.
 	pub subprotocol_name: [u8; 3],
 	/// Fork block to check