Merge pull request #364 from ethcore/block-propagation

Blocks propagation

ethcore/src/block_queue.rs

@@ -30,8 +30,6 @@ use client::BlockStatus;
 /// Block queue status
 #[derive(Debug)]
 pub struct BlockQueueInfo {
-	/// Indicates that queue is full
-	pub full: bool,
 	/// Number of queued blocks pending verification
 	pub unverified_queue_size: usize,
 	/// Number of verified queued blocks pending import
@@ -46,6 +44,16 @@ impl BlockQueueInfo {
 
 	/// The size of the unverified and verifying queues.
 	pub fn incomplete_queue_size(&self) -> usize { self.unverified_queue_size + self.verifying_queue_size }
+
+	/// Indicates that queue is full
+	pub fn is_full(&self) -> bool {
+		self.unverified_queue_size + self.verified_queue_size + self.verifying_queue_size > MAX_UNVERIFIED_QUEUE_SIZE
+	}
+
+	/// Indicates that queue is empty
+	pub fn is_empty(&self) -> bool {
+		self.unverified_queue_size + self.verified_queue_size + self.verifying_queue_size == 0
+	}
 }
 
 /// A queue of blocks. Sits between network or other I/O and the BlockChain.
@@ -287,7 +295,6 @@ impl BlockQueue {
 		for h in hashes {
 			processing.remove(&h);
 		}
-		//TODO: reward peers
 	}
 
 	/// Removes up to `max` verified blocks from the queue
@@ -310,7 +317,6 @@ impl BlockQueue {
 	pub fn queue_info(&self) -> BlockQueueInfo {
 		let verification = self.verification.lock().unwrap();
 		BlockQueueInfo {
-			full: verification.unverified.len() + verification.verifying.len() + verification.verified.len() >= MAX_UNVERIFIED_QUEUE_SIZE,
 			verified_queue_size: verification.verified.len(),
 			unverified_queue_size: verification.unverified.len(),
 			verifying_queue_size: verification.verifying.len(),
@@ -395,4 +401,14 @@ mod tests {
 			panic!("error importing block that has already been drained ({:?})", e);
 		}
 	}
+
+	#[test]
+	fn returns_empty_once_finished() {
+		let mut queue = get_test_queue();
+		queue.import_block(get_good_dummy_block()).expect("error importing block that is valid by definition");
+		queue.flush();
+		queue.drain(1);
+
+		assert!(queue.queue_info().is_empty());
+	}
 }

ethcore/src/client.rs

@@ -27,7 +27,7 @@ use spec::Spec;
 use engine::Engine;
 use views::HeaderView;
 use block_queue::{BlockQueue, BlockQueueInfo};
-use service::NetSyncMessage;
+use service::{NetSyncMessage, SyncMessage};
 use env_info::LastHashes;
 use verification::*;
 use block::*;
@@ -220,7 +220,7 @@ impl Client {
 	}
 
 	/// This is triggered by a message coming from a block queue when the block is ready for insertion
-	pub fn import_verified_blocks(&self, _io: &IoChannel<NetSyncMessage>) -> usize {
+	pub fn import_verified_blocks(&self, io: &IoChannel<NetSyncMessage>) -> usize {
 		let mut ret = 0;
 		let mut bad = HashSet::new();
 		let _import_lock = self.import_lock.lock();
@@ -292,6 +292,10 @@ impl Client {
 			self.report.write().unwrap().accrue_block(&block);
 			trace!(target: "client", "Imported #{} ({})", header.number(), header.hash());
 			ret += 1;
+
+			if self.block_queue.read().unwrap().queue_info().is_empty() {
+				io.send(NetworkIoMessage::User(SyncMessage::BlockVerified)).unwrap();
+			}
 		}
 		self.block_queue.write().unwrap().mark_as_good(&good_blocks);
 		ret