grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into auth-bft

Browse Source
This commit is contained in:
keorn
2016-12-05 16:37:35 +00:00
parent 4f857642b5 a726472023
commit 6fc943ca6d
16 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sync/src/api.rs
View File

@@ -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

6
sync/src/chain.rs
View File

@@ -194,7 +194,7 @@ pub struct SyncStatus {
/// Syncing protocol version. That's the maximum protocol version we connect to.
pub protocol_version: u8,
/// The underlying p2p network version.
pub network_id: usize,
pub network_id: u64,
/// `BlockChain` height for the moment the sync started.
pub start_block_number: BlockNumber,
/// Last fully downloaded and imported block number (if any).
@@ -275,7 +275,7 @@ struct PeerInfo {
/// Peer chain genesis hash
genesis: H256,
/// Peer network id
network_id: usize,
network_id: u64,
/// Peer best block hash
latest_hash: H256,
/// Peer total difficulty if known
@@ -343,7 +343,7 @@ pub struct ChainSync {
/// Last propagated block number
last_sent_block_number: BlockNumber,
/// Network ID
network_id: usize,
network_id: u64,
/// Optional fork block to check
fork_block: Option<(BlockNumber, H256)>,
/// Snapshot downloader.