From 031b7bf225742ddf29b805f1da3fb6d317df579d Mon Sep 17 00:00:00 2001
From: Alex Stokes <r.alex.stokes@gmail.com>
Date: Tue, 20 Nov 2018 10:12:49 -0800
Subject: [PATCH] Add method to calculate the underlying number of bytes

Required for part of attestation validation logic
---
 beacon_chain/utils/boolean-bitfield/src/lib.rs | 18 ++++++++++++++++++
 .../validation/src/attestation_validation.rs   |  6 +++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/beacon_chain/utils/boolean-bitfield/src/lib.rs b/beacon_chain/utils/boolean-bitfield/src/lib.rs
index ceff3bbcf..2a08930fe 100644
--- a/beacon_chain/utils/boolean-bitfield/src/lib.rs
+++ b/beacon_chain/utils/boolean-bitfield/src/lib.rs
@@ -75,6 +75,11 @@ impl BooleanBitfield {
         self.0.len()
     }
 
+    /// Returns the number of bytes required to represent this bitfield.
+    pub fn num_bytes(&self) -> usize {
+        self.to_bytes().len()
+    }
+
     /// Returns the number of `1` bits in the bitfield
     pub fn num_set_bits(&self) -> usize {
         self.0.iter().filter(|&bit| bit).count()
@@ -203,6 +208,7 @@ mod tests {
 
         let out_of_bounds_index = field.len();
         assert!(field.set(out_of_bounds_index, true).is_none());
+        assert!(field.len() == out_of_bounds_index + 1);
         assert!(field.get(out_of_bounds_index).unwrap());
 
         for i in 0..100 {
@@ -213,4 +219,16 @@ mod tests {
             }
         }
     }
+
+    #[test]
+    fn test_num_bytes() {
+        let field = BooleanBitfield::from_bytes(INPUT);
+        assert_eq!(field.num_bytes(), 2);
+
+        let field = BooleanBitfield::from_elem(2, true);
+        assert_eq!(field.num_bytes(), 1);
+
+        let field = BooleanBitfield::from_elem(13, true);
+        assert_eq!(field.num_bytes(), 2);
+    }
 }
diff --git a/beacon_chain/validation/src/attestation_validation.rs b/beacon_chain/validation/src/attestation_validation.rs
index d63d74483..da761432e 100644
--- a/beacon_chain/validation/src/attestation_validation.rs
+++ b/beacon_chain/validation/src/attestation_validation.rs
@@ -199,6 +199,10 @@ where
     }
 }
 
+fn bytes_for_bits(bits: usize) -> usize {
+    (bits.saturating_sub(1) / 8) + 1
+}
+
 impl From<ParentHashesError> for AttestationValidationError {
     fn from(e: ParentHashesError) -> Self {
         match e {
@@ -243,4 +247,4 @@ impl From<SignatureVerificationError> for AttestationValidationError {
                 => AttestationValidationError::OutOfBoundsBitfieldIndex,
         }
     }
-}
+}
\ No newline at end of file