From 6795068ea4fd74ec88a85b8070f208046895604e Mon Sep 17 00:00:00 2001 From: maciejhirsz Date: Mon, 30 Jan 2017 19:13:35 +0100 Subject: [PATCH] Fixed other types --- ethcore/src/blockchain/extras.rs | 2 +- ethcore/src/types/executed.rs | 2 +- ethcore/src/types/trace_types/error.rs | 4 ++-- ethcore/src/types/trace_types/flat.rs | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ethcore/src/blockchain/extras.rs b/ethcore/src/blockchain/extras.rs index 2886fe92b..9e1109f1a 100644 --- a/ethcore/src/blockchain/extras.rs +++ b/ethcore/src/blockchain/extras.rs @@ -233,7 +233,7 @@ impl Decodable for BlockReceipts { impl Encodable for BlockReceipts { fn rlp_append(&self, s: &mut RlpStream) { - s.append(&self.receipts); + Encodable::rlp_append(&self.receipts, s); } } diff --git a/ethcore/src/types/executed.rs b/ethcore/src/types/executed.rs index a1a443b81..b8a9cb970 100644 --- a/ethcore/src/types/executed.rs +++ b/ethcore/src/types/executed.rs @@ -46,7 +46,7 @@ impl Encodable for CallType { CallType::CallCode => 2, CallType::DelegateCall => 3, }; - s.append(&v); + Encodable::rlp_append(&v, s); } } diff --git a/ethcore/src/types/trace_types/error.rs b/ethcore/src/types/trace_types/error.rs index 4ecb9a238..9a2f29f3b 100644 --- a/ethcore/src/types/trace_types/error.rs +++ b/ethcore/src/types/trace_types/error.rs @@ -17,7 +17,7 @@ //! Trace errors. use std::fmt; -use rlp::{Encodable, RlpStream, Decodable, Decoder, DecoderError, Stream, View}; +use rlp::{RlpEncodable, Encodable, RlpStream, Decodable, Decoder, DecoderError, View}; use evm::Error as EvmError; /// Trace evm errors. @@ -79,7 +79,7 @@ impl Encodable for Error { OutOfStack => 4, Internal => 5, }; - s.append(&value); + RlpEncodable::rlp_append(&value, s); } } diff --git a/ethcore/src/types/trace_types/flat.rs b/ethcore/src/types/trace_types/flat.rs index 62abbc474..6ceff86d9 100644 --- a/ethcore/src/types/trace_types/flat.rs +++ b/ethcore/src/types/trace_types/flat.rs @@ -103,7 +103,7 @@ impl FlatTransactionTraces { impl Encodable for FlatTransactionTraces { fn rlp_append(&self, s: &mut RlpStream) { - s.append(&self.0); + Encodable::rlp_append(&self.0, s); } } @@ -144,7 +144,7 @@ impl FlatBlockTraces { impl Encodable for FlatBlockTraces { fn rlp_append(&self, s: &mut RlpStream) { - s.append(&self.0); + Encodable::rlp_append(&self.0, s); } }