From 5fe54901e72cfe3ced401f3ed006b2174c073324 Mon Sep 17 00:00:00 2001 From: maciejhirsz Date: Mon, 30 Jan 2017 18:13:14 +0100 Subject: [PATCH] Fix `Step` encoding --- ethcore/src/engines/tendermint/message.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ethcore/src/engines/tendermint/message.rs b/ethcore/src/engines/tendermint/message.rs index e2e6ef243..8d7bffdfa 100644 --- a/ethcore/src/engines/tendermint/message.rs +++ b/ethcore/src/engines/tendermint/message.rs @@ -20,7 +20,7 @@ use util::*; use super::{Height, View, BlockHash, Step}; use error::Error; use header::Header; -use rlp::{Rlp, UntrustedRlp, RlpStream, Stream, Encodable, Decodable, Decoder, DecoderError, View as RlpView}; +use rlp::{Rlp, UntrustedRlp, RlpStream, Stream, RlpEncodable, Encodable, Decodable, Decoder, DecoderError, View as RlpView}; use ethkey::{recover, public_to_address}; use super::super::vote_collector::Message; @@ -162,7 +162,7 @@ impl Decodable for Step { impl Encodable for Step { fn rlp_append(&self, s: &mut RlpStream) { - s.append(&self.number()); + RlpEncodable::rlp_append(&self.number(), s); } } @@ -194,7 +194,7 @@ impl Encodable for ConsensusMessage { pub fn message_info_rlp(vote_step: &VoteStep, block_hash: Option) -> Bytes { // TODO: figure out whats wrong with nested list encoding - let mut s = RlpStream::new_list(5); + let mut s = RlpStream::new_list(4); s.append(&vote_step.height).append(&vote_step.view).append(&vote_step.step).append(&block_hash.unwrap_or_else(H256::zero)); s.out() } @@ -218,7 +218,7 @@ mod tests { #[test] fn encode_decode() { let message = ConsensusMessage { - signature: H520::default(), + signature: H520::default(), vote_step: VoteStep { height: 10, view: 123, @@ -231,7 +231,7 @@ mod tests { assert_eq!(message, rlp.as_val()); let message = ConsensusMessage { - signature: H520::default(), + signature: H520::default(), vote_step: VoteStep { height: 1314, view: 0,