status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-02-02 01:36:06 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Add some missing RLP serialization routines (#144)" (#146)

Browse Source 
This reverts commit 859aa327cb1ff70d5371dc39e26cb18d63f91d0d.
This commit is contained in:
Jacek Sieka 2019-03-01 07:34:37 -06:00 committed by GitHub
parent 859aa327cb
commit ddb3a9cd94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
beacon_chain/spec/crypto.nim
View File

@ -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

28
beacon_chain/spec/datatypes.nim
View File

@ -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