From ddb3a9cd944cf3dd989e54d5a50850d09f95e6b7 Mon Sep 17 00:00:00 2001
From: Jacek Sieka <arnetheduck@gmail.com>
Date: Fri, 1 Mar 2019 07:34:37 -0600
Subject: [PATCH] Revert "Add some missing RLP serialization routines (#144)"
 (#146)

This reverts commit 859aa327cb1ff70d5371dc39e26cb18d63f91d0d.
---
 beacon_chain/spec/crypto.nim    | 18 ++----------------
 beacon_chain/spec/datatypes.nim | 28 +++++++++++++++++++++++++---
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/beacon_chain/spec/crypto.nim b/beacon_chain/spec/crypto.nim
index c18253ac9..8fe610bcf 100644
--- a/beacon_chain/spec/crypto.nim
+++ b/beacon_chain/spec/crypto.nim
@@ -47,10 +47,10 @@
 import
   sequtils,
   hashes,
-  blscurve, json_serialization, eth/rlp
+  blscurve, json_serialization
 
 export
-  json_serialization, rlp
+  json_serialization
 
 export blscurve.init, blscurve.getBytes, blscurve.combine, blscurve.`$`, blscurve.`==`
 
@@ -127,17 +127,3 @@ proc readValue*(reader: var JsonReader, value: var ValidatorPrivKey) {.inline.}
   value = SigKey.init(reader.readValue(string))
 
 proc newPrivKey*(): ValidatorPrivKey = SigKey.random()
-
-# RLP serialization (TODO: remove if no longer necessary)
-proc append*(writer: var RlpWriter, value: ValidatorPubKey) =
-  writer.append value.getBytes()
-
-proc read*(rlp: var Rlp, T: type ValidatorPubKey): T {.inline.} =
-  ValidatorPubKey.init rlp.toBytes.toOpenArray
-
-proc append*(writer: var RlpWriter, value: ValidatorSig) =
-  writer.append value.getBytes()
-
-proc read*(rlp: var Rlp, T: type ValidatorSig): T {.inline.} =
-  ValidatorSig.init rlp.toBytes.toOpenArray
-
diff --git a/beacon_chain/spec/datatypes.nim b/beacon_chain/spec/datatypes.nim
index c07e2ce48..2279add3b 100644
--- a/beacon_chain/spec/datatypes.nim
+++ b/beacon_chain/spec/datatypes.nim
@@ -482,6 +482,29 @@ type
   # TODO: not in spec
   CrosslinkCommittee* = tuple[committee: seq[ValidatorIndex], shard: uint64]
 
+when true:
+  # TODO: Remove these once RLP serialization is no longer used
+  import nimcrypto, eth/rlp, json_serialization
+  export append, read, json_serialization
+
+  proc append*(rlpWriter: var RlpWriter, value: ValidatorPubKey) =
+    discard
+
+  proc read*(rlp: var Rlp, T: type ValidatorPubKey): T {.inline.} =
+    discard
+
+  proc append*(rlpWriter: var RlpWriter, value: ValidatorIndex) =
+    discard
+
+  proc read*(rlp: var Rlp, T: type ValidatorIndex): T {.inline.} =
+    discard
+
+  proc append*(rlpWriter: var RlpWriter, value: ValidatorSig) =
+    discard
+
+  proc read*(rlp: var Rlp, T: type ValidatorSig): T {.inline.} =
+    discard
+
 func shortValidatorKey*(state: BeaconState, validatorIdx: int): string =
     ($state.validator_registry[validatorIdx].pubkey)[0..7]
 
@@ -491,7 +514,6 @@ func humaneSlotNum*(s: Slot): Slot =
 func humaneEpochNum*(e: Epoch): Epoch =
   e - GENESIS_EPOCH
 
-import nimcrypto, eth/rlp, json_serialization
-export json_serialization, rlp
-export writeValue, readValue, append, read
+export
+  writeValue, readValue