From 05b890860ac8208a46bd0cad2b540895398c0c4e Mon Sep 17 00:00:00 2001
From: Paul Hauner <paul@paulhauner.com>
Date: Tue, 5 Feb 2019 12:35:24 +1100
Subject: [PATCH] Move all attestaion fns into same file

---
 eth2/types/src/{attestation/mod.rs => attestation.rs} | 6 ++++--
 eth2/types/src/attestation/signing.rs                 | 7 -------
 2 files changed, 4 insertions(+), 9 deletions(-)
 rename eth2/types/src/{attestation/mod.rs => attestation.rs} (96%)
 delete mode 100644 eth2/types/src/attestation/signing.rs

diff --git a/eth2/types/src/attestation/mod.rs b/eth2/types/src/attestation.rs
similarity index 96%
rename from eth2/types/src/attestation/mod.rs
rename to eth2/types/src/attestation.rs
index 51c396a3b8..73ea5eec1c 100644
--- a/eth2/types/src/attestation/mod.rs
+++ b/eth2/types/src/attestation.rs
@@ -5,8 +5,6 @@ use rand::RngCore;
 use serde_derive::Serialize;
 use ssz::{hash, Decodable, DecodeError, Encodable, SszStream, TreeHash};
 
-mod signing;
-
 #[derive(Debug, Clone, PartialEq, Serialize)]
 pub struct Attestation {
     pub data: AttestationData,
@@ -19,6 +17,10 @@ impl Attestation {
     pub fn canonical_root(&self) -> Hash256 {
         Hash256::from(&self.hash_tree_root()[..])
     }
+
+    pub fn signable_message(&self, custody_bit: bool) -> Vec<u8> {
+        self.data.signable_message(custody_bit)
+    }
 }
 
 impl Encodable for Attestation {
diff --git a/eth2/types/src/attestation/signing.rs b/eth2/types/src/attestation/signing.rs
deleted file mode 100644
index 1fefa068c5..0000000000
--- a/eth2/types/src/attestation/signing.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-use crate::Attestation;
-
-impl Attestation {
-    pub fn signable_message(&self, custody_bit: bool) -> Vec<u8> {
-        self.data.signable_message(custody_bit)
-    }
-}