From a6d0a0f85eedf2d7b9d66148b8f99111357f4c39 Mon Sep 17 00:00:00 2001
From: Paul Hauner <paul@paulhauner.com>
Date: Tue, 17 Jul 2018 17:35:32 +1000
Subject: [PATCH] Shift around some types in ActiveState, RecentProp

---
 src/state/active_state.rs           |  2 +-
 src/state/recent_proposer_record.rs | 15 +++++++++------
 src/state/transition/ffg.rs         |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/state/active_state.rs b/src/state/active_state.rs
index 5588452fe0..2e59beea28 100644
--- a/src/state/active_state.rs
+++ b/src/state/active_state.rs
@@ -10,7 +10,7 @@ pub struct ActiveState {
     pub height: u64,
     pub randao: Sha256Digest,
     pub ffg_voter_bitfield: Bitfield,
-    pub recent_attesters: Vec<u32>, // TODO: should be u24
+    pub recent_attesters: Vec<usize>, // TODO: should be u24
     pub partial_crosslinks: Vec<PartialCrosslinkRecord>,
     pub total_skip_count: u64,
     pub recent_proposers: Vec<RecentPropserRecord>
diff --git a/src/state/recent_proposer_record.rs b/src/state/recent_proposer_record.rs
index 8c2bf6848d..670db9ebbe 100644
--- a/src/state/recent_proposer_record.rs
+++ b/src/state/recent_proposer_record.rs
@@ -3,15 +3,15 @@ use super::utils::types::*;
 
 #[derive(Clone)]
 pub struct RecentPropserRecord {
-    pub index: u32,     // TODO: make u24
+    pub index: usize,     // TODO: make u24
     pub randao_commitment: Sha256Digest,
-    pub balance_delta: u32, // TODO: make u24
+    pub balance_delta: i64, // TODO: make u24
 }
 
 impl RecentPropserRecord {
-    pub fn new(index: u32, 
+    pub fn new(index: usize, 
                randao_commitment: Sha256Digest, 
-               balance_delta: u32) -> RecentPropserRecord {
+               balance_delta: i64) -> RecentPropserRecord {
         RecentPropserRecord {
             index: index,
             randao_commitment: randao_commitment,
@@ -27,7 +27,8 @@ impl Encodable for RecentPropserRecord {
     fn rlp_append(&self, s: &mut RlpStream) {
         s.append(&self.index);
         s.append(&self.randao_commitment);
-        s.append(&self.balance_delta);
+        // TODO: serialize this if needed.
+        // s.append(&self.balance_delta);
     }
 }
 
@@ -44,10 +45,12 @@ mod tests {
         let balance_delta = 99;
         let r = RecentPropserRecord::new(index, randao_commitment, balance_delta);
         let e = rlp::encode(&r);
-        assert_eq!(e.len(), 35);
+        assert_eq!(e.len(), 34);
         assert_eq!(e[0], 1);
         assert_eq!(e[1], 160);
         assert_eq!(e[2..34], [0; 32]);
+        /*
         assert_eq!(e[34], 99);
+        */
     }
 }
diff --git a/src/state/transition/ffg.rs b/src/state/transition/ffg.rs
index 7b63b47d32..97a3ea9b6c 100644
--- a/src/state/transition/ffg.rs
+++ b/src/state/transition/ffg.rs
@@ -185,7 +185,7 @@ mod tests {
                 vote_count += 2;
             }
             assert_eq!(pc.voter_bitfield.num_true_bits(), vote_count,
-            "shard_id {} failed.", id);
+                       "shard_id {} failed.", id);
             assert_eq!(pc.shard_block_hash, shard_hashes[id as usize]);
         }
     }