From 80580795a282cb5bc515bbbb12c0fd98d3efd710 Mon Sep 17 00:00:00 2001
From: Yuriy Glukhov <yuriy.glukhov@gmail.com>
Date: Fri, 1 Mar 2019 16:59:15 +0200
Subject: [PATCH] Fixed RLP serialization for crypto primitives

---
 beacon_chain/spec/crypto.nim    |  4 ++--
 beacon_chain/spec/datatypes.nim | 28 +++-------------------------
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/beacon_chain/spec/crypto.nim b/beacon_chain/spec/crypto.nim
index e9918ae42f..ef48348e22 100644
--- a/beacon_chain/spec/crypto.nim
+++ b/beacon_chain/spec/crypto.nim
@@ -47,10 +47,10 @@
 import
   sequtils,
   hashes,
-  blscurve, json_serialization
+  blscurve, json_serialization, eth/rlp
 
 export
-  json_serialization
+  json_serialization, rlp
 
 export blscurve.init, blscurve.getBytes, blscurve.combine, blscurve.`$`, blscurve.`==`
 
diff --git a/beacon_chain/spec/datatypes.nim b/beacon_chain/spec/datatypes.nim
index e9cb03194f..d3d9978370 100644
--- a/beacon_chain/spec/datatypes.nim
+++ b/beacon_chain/spec/datatypes.nim
@@ -494,29 +494,6 @@ 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]
 
@@ -526,6 +503,7 @@ func humaneSlotNum*(s: Slot): Slot =
 func humaneEpochNum*(e: Epoch): Epoch =
   e - GENESIS_EPOCH
 
-export
-  writeValue, readValue
+import nimcrypto, eth/rlp, json_serialization
+export json_serialization, rlp
+export writeValue, readValue, append, read