Merge pull request #5419 from paritytech/on-demand-priority

Improve on-demand dispatch and add support for batch requests

ethcore/light/src/lib.rs

@@ -44,13 +44,13 @@ pub mod provider;
 
 #[cfg(feature = "ipc")]
 pub mod provider {
-    #![allow(dead_code, unused_assignments, unused_variables, missing_docs)] // codegen issues
+	#![allow(dead_code, unused_assignments, unused_variables, missing_docs)] // codegen issues
 	include!(concat!(env!("OUT_DIR"), "/provider.rs"));
 }
 
 #[cfg(feature = "ipc")]
 pub mod remote {
-    pub use provider::LightProviderClient;
+	pub use provider::LightProviderClient;
 }
 
 mod types;

ethcore/light/src/net/context.rs

@@ -20,7 +20,7 @@ use network::{NetworkContext, PeerId, NodeId};
 
 use super::{Announcement, LightProtocol, ReqId};
 use super::error::Error;
-use request::Requests;
+use request::NetworkRequests as Requests;
 
 /// An I/O context which allows sending and receiving packets as well as
 /// disconnecting peers. This is used as a generalization of the portions

ethcore/light/src/net/mod.rs

@@ -33,7 +33,7 @@ use std::sync::Arc;
 use std::sync::atomic::{AtomicUsize, Ordering};
 
 use provider::Provider;
-use request::{Request, Requests, Response};
+use request::{Request, NetworkRequests as Requests, Response};
 
 use self::request_credits::{Credits, FlowParams};
 use self::context::{Ctx, TickCtx};
@@ -108,9 +108,14 @@ mod timeout {
 }
 
 /// A request id.
+#[cfg(not(test))]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash)]
 pub struct ReqId(usize);
 
+#[cfg(test)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash)]
+pub struct ReqId(pub usize);
+
 impl fmt::Display for ReqId {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		write!(f, "Request #{}", self.0)

ethcore/light/src/net/request_set.rs

@@ -25,7 +25,7 @@ use std::collections::{BTreeMap, HashMap};
 use std::iter::FromIterator;
 
 use request::Request;
-use request::Requests;
+use request::NetworkRequests as Requests;
 use net::{timeout, ReqId};
 use util::U256;
 

ethcore/light/src/net/tests/mod.rs

@@ -39,14 +39,14 @@ use std::sync::Arc;
 
 // helper for encoding a single request into a packet.
 // panics on bad backreference.
-fn encode_single(request: Request) -> Requests {
+fn encode_single(request: Request) -> NetworkRequests {
 	let mut builder = RequestBuilder::default();
 	builder.push(request).unwrap();
 	builder.build()
 }
 
 // helper for making a packet out of `Requests`.
-fn make_packet(req_id: usize, requests: &Requests) -> Vec<u8> {
+fn make_packet(req_id: usize, requests: &NetworkRequests) -> Vec<u8> {
 	let mut stream = RlpStream::new_list(2);
 	stream.append(&req_id).append_list(&requests.requests());
 	stream.out()