Rename SSZ traits (Encodable -> Encode)

eth2/types/src/slot_epoch.rs

@@ -15,7 +15,7 @@ use crate::test_utils::TestRandom;
 use rand::RngCore;
 use serde_derive::{Deserialize, Serialize};
 use slog;
-use ssz::{ssz_encode, Decodable, DecodeError, Encodable};
+use ssz::{ssz_encode, Decode, DecodeError, Encode};
 use std::cmp::{Ord, Ordering};
 use std::fmt;
 use std::hash::{Hash, Hasher};

eth2/types/src/slot_epoch_macros.rs

@@ -192,13 +192,13 @@ macro_rules! impl_display {
 
 macro_rules! impl_ssz {
     ($type: ident) => {
-        impl Encodable for $type {
+        impl Encode for $type {
             fn is_ssz_fixed_len() -> bool {
-                <u64 as Encodable>::is_ssz_fixed_len()
+                <u64 as Encode>::is_ssz_fixed_len()
             }
 
             fn ssz_fixed_len() -> usize {
-                <u64 as Encodable>::ssz_fixed_len()
+                <u64 as Encode>::ssz_fixed_len()
             }
 
             fn ssz_append(&self, buf: &mut Vec<u8>) {
@@ -206,13 +206,13 @@ macro_rules! impl_ssz {
             }
         }
 
-        impl Decodable for $type {
+        impl Decode for $type {
             fn is_ssz_fixed_len() -> bool {
-                <u64 as Decodable>::is_ssz_fixed_len()
+                <u64 as Decode>::is_ssz_fixed_len()
             }
 
             fn ssz_fixed_len() -> usize {
-                <u64 as Decodable>::ssz_fixed_len()
+                <u64 as Decode>::ssz_fixed_len()
             }
 
             fn from_ssz_bytes(bytes: &[u8]) -> Result<Self, DecodeError> {

eth2/types/src/slot_height.rs

@@ -3,7 +3,7 @@ use crate::test_utils::TestRandom;
 
 use rand::RngCore;
 use serde_derive::Serialize;
-use ssz::{ssz_encode, Decodable, DecodeError, Encodable};
+use ssz::{ssz_encode, Decode, DecodeError, Encode};
 use std::cmp::{Ord, Ordering};
 use std::fmt;
 use std::hash::{Hash, Hasher};

eth2/types/src/test_utils/macros.rs

@@ -5,7 +5,7 @@ macro_rules! ssz_tests {
         #[test]
         pub fn test_ssz_round_trip() {
             use crate::test_utils::{SeedableRng, TestRandom, XorShiftRng};
-            use ssz::{ssz_encode, Decodable};
+            use ssz::{ssz_encode, Decode};
 
             let mut rng = XorShiftRng::from_seed([42; 16]);
             let original = $type::random_for_test(&mut rng);

eth2/types/src/tree_hash_vector.rs

@@ -1,7 +1,7 @@
 use crate::test_utils::{RngCore, TestRandom};
 use cached_tree_hash::CachedTreeHash;
 use serde_derive::{Deserialize, Serialize};
-use ssz::{Decodable, DecodeError, Encodable};
+use ssz::{Decode, DecodeError, Encode};
 use std::ops::{Deref, DerefMut};
 use tree_hash::TreeHash;
 
@@ -82,18 +82,18 @@ where
     }
 }
 
-impl<T> Encodable for TreeHashVector<T>
+impl<T> Encode for TreeHashVector<T>
 where
-    T: Encodable,
+    T: Encode,
 {
     fn ssz_append(&self, s: &mut SszStream) {
         s.append_vec(self)
     }
 }
 
-impl<T> Decodable for TreeHashVector<T>
+impl<T> Decode for TreeHashVector<T>
 where
-    T: Decodable,
+    T: Decode,
 {
     fn ssz_decode(bytes: &[u8], index: usize) -> Result<(Self, usize), DecodeError> {
         ssz::decode_ssz_list(bytes, index).and_then(|(vec, i)| Ok((vec.into(), i)))