From a285fbab6d7f807626b44a49271159cfc1d29872 Mon Sep 17 00:00:00 2001 From: Nikolay Volf Date: Thu, 17 Mar 2016 14:11:32 +0100 Subject: [PATCH] overhaul to flag --- ethcore/src/client/client.rs | 7 +----- ethcore/src/service.rs | 4 ++-- rpc/src/v1/impls/eth.rs | 2 +- sync/src/chain.rs | 41 ++++++++++++------------------------ sync/src/lib.rs | 7 ++---- sync/src/tests/helpers.rs | 2 +- 6 files changed, 21 insertions(+), 42 deletions(-) diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs index d8c48e696..6ee1b88d5 100644 --- a/ethcore/src/client/client.rs +++ b/ethcore/src/client/client.rs @@ -324,6 +324,7 @@ impl Client where V: Verifier { invalid: invalid_blocks, enacted: enacted, retracted: retracted, + is_last: self.queue_info().is_empty() })).unwrap(); } } @@ -334,12 +335,6 @@ impl Client where V: Verifier { } } - { - if self.queue_info().is_empty() { - io.send(NetworkIoMessage::User(SyncMessage::BlockQueueEmpty)).expect("error sending message to sync module"); - } - } - imported } diff --git a/ethcore/src/service.rs b/ethcore/src/service.rs index 1c2385934..a46581e3c 100644 --- a/ethcore/src/service.rs +++ b/ethcore/src/service.rs @@ -35,13 +35,13 @@ pub enum SyncMessage { retracted: Vec, /// Hashes of blocks that are now included in cannonical chain enacted: Vec, + /// Set when blockqueue is empty + is_last: bool, }, /// Best Block Hash in chain has been changed NewChainHead, /// A block is ready BlockVerified, - /// blocks queue is empty - BlockQueueEmpty, } /// IO Message type used for Network service diff --git a/rpc/src/v1/impls/eth.rs b/rpc/src/v1/impls/eth.rs index b0e31ba97..520b37045 100644 --- a/rpc/src/v1/impls/eth.rs +++ b/rpc/src/v1/impls/eth.rs @@ -151,7 +151,7 @@ impl Eth for EthClient Params::None => { let status = take_weak!(self.sync).status(); let res = match status.state { - SyncState::NotSynced | SyncState::Idle | SyncState::FullySynced => SyncStatus::None, + SyncState::NotSynced | SyncState::Idle => SyncStatus::None, SyncState::Waiting | SyncState::Blocks | SyncState::NewBlocks => SyncStatus::Info(SyncInfo { starting_block: U256::from(status.start_block_number), current_block: U256::from(take_weak!(self.client).chain_info().best_block_number), diff --git a/sync/src/chain.rs b/sync/src/chain.rs index f7a03a7bd..def9ad7f4 100644 --- a/sync/src/chain.rs +++ b/sync/src/chain.rs @@ -116,8 +116,6 @@ pub enum SyncState { Blocks, /// Downloading blocks learned from NewHashes packet NewBlocks, - /// Once has an event that client finished processing new blocks - FullySynced, } /// Syncing status and statistics @@ -217,6 +215,8 @@ pub struct ChainSync { network_id: U256, /// Miner miner: Arc, + /// Fully-synced flag + is_fully_synced: bool, } type RlpResponseResult = Result, PacketDecodeError>; @@ -243,6 +243,7 @@ impl ChainSync { max_download_ahead_blocks: max(MAX_HEADERS_TO_REQUEST, config.max_download_ahead_blocks), network_id: config.network_id, miner: miner, + is_fully_synced: true, } } @@ -629,7 +630,7 @@ impl ChainSync { fn can_sync(&self) -> bool { match self.state { - SyncState::Idle | SyncState::NotSynced | SyncState::FullySynced => true, + SyncState::Idle | SyncState::NotSynced => true, _ => false } } @@ -947,7 +948,7 @@ impl ChainSync { /// Called when peer sends us new transactions fn on_peer_transactions(&mut self, io: &mut SyncIo, peer_id: PeerId, r: &UntrustedRlp) -> Result<(), PacketDecodeError> { // accepting transactions once only fully synced - if self.state != SyncState::FullySynced { + if !self.is_fully_synced { return Ok(()); } @@ -1292,8 +1293,10 @@ impl ChainSync { } /// called when block is imported to chain, updates transactions queue and propagates the blocks - pub fn chain_new_blocks(&mut self, io: &mut SyncIo, imported: &[H256], invalid: &[H256], enacted: &[H256], retracted: &[H256]) { - if self.state == SyncState::FullySynced { + pub fn chain_new_blocks(&mut self, io: &mut SyncIo, imported: &[H256], invalid: &[H256], enacted: &[H256], retracted: &[H256], is_last: bool) { + // Set the state in which it can accept transactions from the net + self.is_fully_synced = is_last; + if self.is_fully_synced { // Notify miner self.miner.chain_new_blocks(io.chain(), imported, invalid, enacted, retracted); } @@ -1303,21 +1306,7 @@ impl ChainSync { } pub fn chain_new_head(&mut self, io: &mut SyncIo) { - if self.state == SyncState::FullySynced { - self.miner.prepare_sealing(io.chain()); - } - } - - // called once has nothing to download and client reports that all that downloaded is imported - pub fn set_fully_synced(&mut self) { - self.state = SyncState::FullySynced; - } - - // handles event from client about empty blow_queue - pub fn client_block_queue_empty(&mut self) { - if self.state == SyncState::Idle { - self.set_fully_synced(); - } + self.miner.prepare_sealing(io.chain()); } } @@ -1654,7 +1643,6 @@ mod tests { client.add_blocks(1, EachBlockWith::UncleAndTransaction); client.add_blocks(1, EachBlockWith::Transaction); let mut sync = dummy_sync_with_peer(client.block_hash_delta_minus(5)); - sync.state = SyncState::FullySynced; let good_blocks = vec![client.block_hash_delta_minus(2)]; let retracted_blocks = vec![client.block_hash_delta_minus(1)]; @@ -1663,10 +1651,10 @@ mod tests { let mut io = TestIo::new(&mut client, &mut queue, None); // when - sync.chain_new_blocks(&mut io, &[], &[], &[], &good_blocks); + sync.chain_new_blocks(&mut io, &[], &[], &[], &good_blocks, true); assert_eq!(sync.miner.status().transaction_queue_future, 0); assert_eq!(sync.miner.status().transaction_queue_pending, 1); - sync.chain_new_blocks(&mut io, &good_blocks, &[], &[], &retracted_blocks); + sync.chain_new_blocks(&mut io, &good_blocks, &[], &[], &retracted_blocks, true); // then let status = sync.miner.status(); @@ -1682,7 +1670,6 @@ mod tests { client.add_blocks(1, EachBlockWith::UncleAndTransaction); client.add_blocks(1, EachBlockWith::Transaction); let mut sync = dummy_sync_with_peer(client.block_hash_delta_minus(5)); - sync.state = SyncState::Idle; let good_blocks = vec![client.block_hash_delta_minus(2)]; let retracted_blocks = vec![client.block_hash_delta_minus(1)]; @@ -1691,10 +1678,10 @@ mod tests { let mut io = TestIo::new(&mut client, &mut queue, None); // when - sync.chain_new_blocks(&mut io, &[], &[], &[], &good_blocks); + sync.chain_new_blocks(&mut io, &[], &[], &[], &good_blocks, false); assert_eq!(sync.miner.status().transaction_queue_future, 0); assert_eq!(sync.miner.status().transaction_queue_pending, 0); - sync.chain_new_blocks(&mut io, &good_blocks, &[], &[], &retracted_blocks); + sync.chain_new_blocks(&mut io, &good_blocks, &[], &[], &retracted_blocks, false); // then let status = sync.miner.status(); diff --git a/sync/src/lib.rs b/sync/src/lib.rs index d78ac3b89..8ab6a23e9 100644 --- a/sync/src/lib.rs +++ b/sync/src/lib.rs @@ -166,17 +166,14 @@ impl NetworkProtocolHandler for EthSync { fn message(&self, io: &NetworkContext, message: &SyncMessage) { match *message { - SyncMessage::NewChainBlocks { ref imported, ref invalid, ref enacted, ref retracted } => { + SyncMessage::NewChainBlocks { ref imported, ref invalid, ref enacted, ref retracted, is_last } => { let mut sync_io = NetSyncIo::new(io, self.chain.deref()); - self.sync.write().unwrap().chain_new_blocks(&mut sync_io, imported, invalid, enacted, retracted); + self.sync.write().unwrap().chain_new_blocks(&mut sync_io, imported, invalid, enacted, retracted, is_last); }, SyncMessage::NewChainHead => { let mut sync_io = NetSyncIo::new(io, self.chain.deref()); self.sync.write().unwrap().chain_new_head(&mut sync_io); }, - SyncMessage::BlockQueueEmpty => { - self.sync.write().unwrap().client_block_queue_empty(); - } _ => {/* Ignore other messages */}, } } diff --git a/sync/src/tests/helpers.rs b/sync/src/tests/helpers.rs index b3e62ccc6..42ef728b9 100644 --- a/sync/src/tests/helpers.rs +++ b/sync/src/tests/helpers.rs @@ -168,6 +168,6 @@ impl TestNet { pub fn trigger_chain_new_blocks(&mut self, peer_id: usize) { let mut peer = self.peer_mut(peer_id); - peer.sync.chain_new_blocks(&mut TestIo::new(&mut peer.chain, &mut peer.queue, None), &[], &[], &[], &[]); + peer.sync.chain_new_blocks(&mut TestIo::new(&mut peer.chain, &mut peer.queue, None), &[], &[], &[], &[], true); } }