Merge branch 'master' into auth-round

util/bigint/Cargo.toml

@@ -4,7 +4,7 @@ homepage = "http://ethcore.io"
 repository = "https://github.com/ethcore/parity"
 license = "GPL-3.0"
 name = "ethcore-bigint"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
 

util/bigint/src/hash.rs

@@ -386,6 +386,12 @@ macro_rules! impl_hash {
 				}
 			}
 		}
+
+		impl<'a> From<&'a [u8]> for $from {
+			fn from(s: &'a [u8]) -> $from {
+				$from::from_slice(s)
+			}
+		}
 	}
 }
 

util/src/misc.rs

@@ -40,7 +40,7 @@ pub fn version() -> String {
 	let date_dash = if commit_date.is_empty() { "" } else { "-" };
 	let env = Target::env();
 	let env_dash = if env.is_empty() { "" } else { "-" };
-	format!("Parity/v{}-unstable{}{}{}{}/{}-{}{}{}/rustc{}", env!("CARGO_PKG_VERSION"), sha3_dash, sha3, date_dash, commit_date, Target::arch(), Target::os(), env_dash, env, rustc_version())
+	format!("Parity/v{}-beta{}{}{}{}/{}-{}{}{}/rustc{}", env!("CARGO_PKG_VERSION"), sha3_dash, sha3, date_dash, commit_date, Target::arch(), Target::os(), env_dash, env, rustc_version())
 }
 
 /// Get the standard version data for this software.

util/src/stats.rs

@@ -28,13 +28,17 @@ pub struct Histogram {
 }
 
 impl Histogram {
-	/// Histogram if a sorted corpus is at least fills the buckets.
+	/// Histogram of a sorted corpus if it at least spans the buckets. Bounds are left closed.
 	pub fn new(corpus: &[U256], bucket_number: usize) -> Option<Histogram> {
-		if corpus.len() <= bucket_number { return None; }
-		let corpus_end = corpus.last().expect("there are at least bucket_number elements; qed").clone();
-		// If there are extremely few transactions, go from zero.
-		let corpus_start = corpus.first().expect("there are at least bucket_number elements; qed").clone();
-		let bucket_size = (corpus_end - corpus_start + 1.into()) / bucket_number.into();
+		if corpus.len() < 1 { return None; }
+		let corpus_end = corpus.last().expect("there is at least 1 element; qed").clone();
+		let corpus_start = corpus.first().expect("there is at least 1 element; qed").clone();
+		// Bucket needs to be at least 1 wide.
+		let bucket_size = {
+			// Round up to get the entire corpus included.
+			let raw_bucket_size = (corpus_end - corpus_start + bucket_number.into()) / bucket_number.into();
+			if raw_bucket_size == 0.into() { 1.into() } else { raw_bucket_size }
+		};
 		let mut bucket_end = corpus_start + bucket_size;
 
 		let mut bucket_bounds = vec![corpus_start; bucket_number + 1];
@@ -42,10 +46,12 @@ impl Histogram {
 		let mut corpus_i = 0;
 		// Go through the corpus adding to buckets.
 		for bucket in 0..bucket_number {
-			while corpus[corpus_i] < bucket_end {
+			while corpus.get(corpus_i).map_or(false, |v| v < &bucket_end) {
+				// Initialized to size bucket_number above; iterates up to bucket_number; qed
 				counts[bucket] += 1;
 				corpus_i += 1;
 			}
+			// Initialized to size bucket_number + 1 above; iterates up to bucket_number; subscript is in range; qed
 			bucket_bounds[bucket + 1] = bucket_end;
 			bucket_end = bucket_end + bucket_size;
 		}
@@ -62,14 +68,36 @@ mod tests {
 	#[test]
 	fn check_histogram() {
 		let hist = Histogram::new(&vec_into![643,689,1408,2000,2296,2512,4250,4320,4842,4958,5804,6065,6098,6354,7002,7145,7845,8589,8593,8895], 5).unwrap();
-		let correct_bounds: Vec<U256> = vec_into![643,2293,3943,5593,7243,8893];
-		assert_eq!(Histogram { bucket_bounds: correct_bounds, counts: vec![4,2,4,6,3] }, hist);
-
-		assert!(Histogram::new(&vec_into![1, 2], 5).is_none());
+		let correct_bounds: Vec<U256> = vec_into![643, 2294, 3945, 5596, 7247, 8898];
+		assert_eq!(Histogram { bucket_bounds: correct_bounds, counts: vec![4,2,4,6,4] }, hist);
 	}
 
 	#[test]
-	fn should_not_panic_when_asking_for_bucket_too_big() {
-		assert!(Histogram::new(&vec_into![1, 2], 2).is_none());
+	fn smaller_data_range_than_bucket_range() {
+		assert_eq!(
+			Histogram::new(&vec_into![1, 2, 2], 3),
+			Some(Histogram { bucket_bounds: vec_into![1, 2, 3, 4], counts: vec![1, 2, 0] })
+		);
+	}
+
+	#[test]
+	fn data_range_is_not_multiple_of_bucket_range() {
+		assert_eq!(
+			Histogram::new(&vec_into![1, 2, 5], 2),
+			Some(Histogram { bucket_bounds: vec_into![1, 4, 7], counts: vec![2, 1] })
+		);
+	}
+
+	#[test]
+	fn data_range_is_multiple_of_bucket_range() {
+		assert_eq!(
+			Histogram::new(&vec_into![1, 2, 6], 2),
+			Some(Histogram { bucket_bounds: vec_into![1, 4, 7], counts: vec![2, 1] })
+		);
+	}
+
+	#[test]
+	fn none_when_too_few_data() {
+		assert!(Histogram::new(&vec_into![], 1).is_none());
 	}
 }