Clean out some occurances of SszStream

This commit is contained in:
Paul Hauner
2019-05-06 19:50:05 +10:00
parent 5550d14d62
commit 759d0250c5
11 changed files with 39 additions and 22 deletions

View File

@@ -3,7 +3,7 @@ use cached_tree_hash::cached_tree_hash_ssz_encoding_as_vector;
use serde::de::{Deserialize, Deserializer};
use serde::ser::{Serialize, Serializer};
use serde_hex::{encode as hex_encode, PrefixedHexVisitor};
use ssz::{ssz_encode, Decodable, DecodeError, Encodable, SszStream};
use ssz::{ssz_encode, Decodable, DecodeError, Encodable};
use tree_hash::tree_hash_ssz_encoding_as_vector;
/// A BLS aggregate signature.

View File

@@ -4,7 +4,7 @@ use hex::encode as hex_encode;
use serde::de::{Deserialize, Deserializer};
use serde::ser::{Serialize, Serializer};
use serde_hex::HexVisitor;
use ssz::{ssz_encode, Decodable, DecodeError, Encodable, SszStream};
use ssz::{ssz_encode, Decodable, DecodeError, Encodable};
use tree_hash::tree_hash_ssz_encoding_as_vector;
/// A single BLS signature.

View File

@@ -93,7 +93,7 @@ pub fn ssz_encode_derive(input: TokenStream) -> TokenStream {
}
fn ssz_fixed_len() -> usize {
if <Self as Encodable>::is_ssz_fixed_len() {
if <Self as ssz::Encodable>::is_ssz_fixed_len() {
#(
<#field_types_b as ssz::Encodable>::ssz_fixed_len() +
)*
@@ -161,7 +161,7 @@ pub fn ssz_decode_derive(input: TokenStream) -> TokenStream {
if should_skip_deserializing(field) {
// Field should not be deserialized; use a `Default` impl to instantiate.
decodes.push(quote! {
#ident: <_>::default(),
#ident: <_>::default()
});
} else {
let ty = &field.ty;