Rename Requests to Batch

ethcore/light/src/net/mod.rs

@@ -899,7 +899,7 @@ impl LightProtocol {
 		// the maximum amount of requests we'll fill in a single packet.
 		const MAX_REQUESTS: usize = 256;
 
-		use ::request::RequestBuilder;
+		use ::request::Builder;
 		use ::request::CompleteRequest;
 
 		let peers = self.peers.read();
@@ -914,7 +914,7 @@ impl LightProtocol {
 		let peer: &mut Peer = &mut *peer;
 
 		let req_id: u64 = raw.val_at(0)?;
-		let mut request_builder = RequestBuilder::default();
+		let mut request_builder = Builder::default();
 
 		trace!(target: "pip", "Received requests (id: {}) from peer {}", req_id, peer_id);
 

ethcore/light/src/net/request_set.rs

@@ -147,7 +147,7 @@ fn compute_timeout(reqs: &Requests) -> Duration {
 #[cfg(test)]
 mod tests {
 	use net::ReqId;
-	use request::RequestBuilder;
+	use request::Builder;
 	use time::{SteadyTime, Duration};
 	use super::{RequestSet, compute_timeout};
 
@@ -156,7 +156,7 @@ mod tests {
 		let test_begin = SteadyTime::now();
 		let mut req_set = RequestSet::default();
 
-		let the_req = RequestBuilder::default().build();
+		let the_req = Builder::default().build();
 		let req_time = compute_timeout(&the_req);
 		req_set.insert(ReqId(0), the_req.clone(), 0.into(), test_begin);
 		req_set.insert(ReqId(1), the_req, 0.into(), test_begin + Duration::seconds(1));
@@ -173,7 +173,7 @@ mod tests {
 
 	#[test]
 	fn cumulative_cost() {
-		let the_req = RequestBuilder::default().build();
+		let the_req = Builder::default().build();
 		let test_begin = SteadyTime::now();
 		let test_end = test_begin + Duration::seconds(1);
 		let mut req_set = RequestSet::default();

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

@@ -41,7 +41,7 @@ use std::sync::Arc;
 // helper for encoding a single request into a packet.
 // panics on bad backreference.
 fn encode_single(request: Request) -> NetworkRequests {
-	let mut builder = RequestBuilder::default();
+	let mut builder = Builder::default();
 	builder.push(request).unwrap();
 	builder.build()
 }
@@ -344,7 +344,7 @@ fn get_block_bodies() {
 		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &my_status);
 	}
 
-	let mut builder = RequestBuilder::default();
+	let mut builder = Builder::default();
 	let mut bodies = Vec::new();
 
 	for i in 0..10 {
@@ -400,7 +400,7 @@ fn get_block_receipts() {
 		.take(10)
 		.collect();
 
-	let mut builder = RequestBuilder::default();
+	let mut builder = Builder::default();
 	let mut receipts = Vec::new();
 	for hash in block_hashes.iter().cloned() {
 		builder.push(Request::Receipts(IncompleteReceiptsRequest { hash: hash.into() })).unwrap();
@@ -448,7 +448,7 @@ fn get_state_proofs() {
 	let key1: H256 = U256::from(11223344).into();
 	let key2: H256 = U256::from(99988887).into();
 
-	let mut builder = RequestBuilder::default();
+	let mut builder = Builder::default();
 	builder.push(Request::Account(IncompleteAccountRequest {
 		block_hash: H256::default().into(),
 		address_hash: key1.into(),