From 04acdd6ca0afa7119653487d6673f7020573fb72 Mon Sep 17 00:00:00 2001
From: keorn <pczaban@gmail.com>
Date: Thu, 24 Nov 2016 19:57:58 +0000
Subject: [PATCH] reuse rlp generation

---
 ethcore/src/engines/tendermint/message.rs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/ethcore/src/engines/tendermint/message.rs b/ethcore/src/engines/tendermint/message.rs
index a9a446259..df671f82b 100644
--- a/ethcore/src/engines/tendermint/message.rs
+++ b/ethcore/src/engines/tendermint/message.rs
@@ -18,7 +18,7 @@
 
 use util::*;
 use super::{Height, Round, BlockHash, Step};
-use error::{Error, BlockError};
+use error::Error;
 use header::Header;
 use rlp::*;
 use ethkey::{recover, public_to_address};
@@ -49,7 +49,6 @@ impl ConsensusMessage {
 		})
 	}
 
-
 	pub fn is_height(&self, height: Height) -> bool {
 		self.height == height
 	}
@@ -140,16 +139,13 @@ impl Decodable for ConsensusMessage {
 		})
   }
 } 
+
 impl Encodable for ConsensusMessage {
 	fn rlp_append(&self, s: &mut RlpStream) {
+		let info = message_info_rlp(self.height, self.round, self.step, self.block_hash);
 		s.begin_list(2)
 			.append(&self.signature)
-			// TODO: figure out whats wrong with nested list encoding
-			.begin_list(5)
-			.append(&self.height)
-			.append(&self.round)
-			.append(&self.step)
-			.append(&self.block_hash.unwrap_or(H256::zero()));
+			.append_raw(&info, 1);
 	}
 }