From 7f1bddb267dd11d340675204854e2f2d30be2433 Mon Sep 17 00:00:00 2001 From: Yuriy Glukhov Date: Tue, 5 Feb 2019 20:21:18 +0100 Subject: [PATCH] Use nim-eth (#82) --- beacon_chain.nimble | 4 +--- beacon_chain/beacon_chain_db.nim | 4 ++-- beacon_chain/beacon_node.nim | 4 ++-- beacon_chain/gossipsub_protocol.nim | 4 ++-- beacon_chain/spec/datatypes.nim | 4 ++-- beacon_chain/spec/digest.nim | 2 +- beacon_chain/spec/validator.nim | 2 +- beacon_chain/ssz.nim | 2 +- beacon_chain/sync_protocol.nim | 2 +- research/sereth.nim | 2 +- tests/test_ssz.nim | 2 +- 11 files changed, 15 insertions(+), 17 deletions(-) diff --git a/beacon_chain.nimble b/beacon_chain.nimble index a636a9245..6082c7943 100644 --- a/beacon_chain.nimble +++ b/beacon_chain.nimble @@ -13,11 +13,9 @@ bin = @[ ### Dependencies requires "nim >= 0.18.0", - "eth_common", - "eth_keys", + "https://github.com/status-im/nim-eth", "nimcrypto", "https://github.com/status-im/nim-blscurve#master", - "eth_p2p", "ranges", "chronicles", "confutils", diff --git a/beacon_chain/beacon_chain_db.nim b/beacon_chain/beacon_chain_db.nim index d7e19248e..5d17e0634 100644 --- a/beacon_chain/beacon_chain_db.nim +++ b/beacon_chain/beacon_chain_db.nim @@ -1,8 +1,8 @@ import os, json, tables, options, - chronicles, json_serialization, eth_common/eth_types_json_serialization, + chronicles, json_serialization, eth/common/eth_types_json_serialization, spec/[datatypes, digest, crypto], - eth_trie/db, ssz + eth/trie/db, ssz type diff --git a/beacon_chain/beacon_node.nim b/beacon_chain/beacon_node.nim index 505001e9a..61ec2fb58 100644 --- a/beacon_chain/beacon_node.nim +++ b/beacon_chain/beacon_node.nim @@ -1,10 +1,10 @@ import std_shims/[os_shims, objects], net, sequtils, options, tables, - asyncdispatch2, chronicles, confutils, eth_p2p, eth_keys, + asyncdispatch2, chronicles, confutils, eth/[p2p, keys], spec/[datatypes, digest, crypto, beaconstate, helpers, validator], conf, time, state_transition, fork_choice, ssz, beacon_chain_db, validator_pool, extras, mainchain_monitor, sync_protocol, gossipsub_protocol, trusted_state_snapshots, - eth_trie/db, eth_trie/backends/rocksdb_backend + eth/trie/db, eth/trie/backends/rocksdb_backend type BeaconNode* = ref object diff --git a/beacon_chain/gossipsub_protocol.nim b/beacon_chain/gossipsub_protocol.nim index 8e29e7a94..9e91d02f3 100644 --- a/beacon_chain/gossipsub_protocol.nim +++ b/beacon_chain/gossipsub_protocol.nim @@ -1,7 +1,7 @@ import tables, sets, macros, base64, - asyncdispatch2, nimcrypto/sysrand, chronicles, rlp, json_serialization, - eth_p2p, eth_p2p/[rlpx, peer_pool], + asyncdispatch2, nimcrypto/sysrand, chronicles, json_serialization, + eth/[p2p, rlp], eth/p2p/[rlpx, peer_pool], spec/[datatypes, crypto] type diff --git a/beacon_chain/spec/datatypes.nim b/beacon_chain/spec/datatypes.nim index 9d65e8cc5..1fa16c91f 100644 --- a/beacon_chain/spec/datatypes.nim +++ b/beacon_chain/spec/datatypes.nim @@ -24,7 +24,7 @@ # types / composition import - eth_common, math, + eth/common, math, ./crypto, ./digest # TODO Data types: @@ -437,7 +437,7 @@ template epoch*(slot: int|uint64): auto = when true: # TODO: Remove these once RLP serialization is no longer used - import nimcrypto, rlp, json_serialization + import nimcrypto, eth/rlp, json_serialization export append, read, json_serialization proc append*(rlpWriter: var RlpWriter, value: ValidatorPubKey) = diff --git a/beacon_chain/spec/digest.nim b/beacon_chain/spec/digest.nim index 7e980131a..13eb09d2b 100644 --- a/beacon_chain/spec/digest.nim +++ b/beacon_chain/spec/digest.nim @@ -21,7 +21,7 @@ # `eth2hash`, and it outputs a `Eth2Digest`. Easy to sed :) import - nimcrypto/[blake2, hash], eth_common/eth_types_json_serialization, + nimcrypto/[blake2, hash], eth/common/eth_types_json_serialization, hashes export diff --git a/beacon_chain/spec/validator.nim b/beacon_chain/spec/validator.nim index 0b58ce4ee..cfdca9cc0 100644 --- a/beacon_chain/spec/validator.nim +++ b/beacon_chain/spec/validator.nim @@ -8,7 +8,7 @@ import options, nimcrypto, sequtils, math, - eth_common, + eth/common, ../ssz, ./crypto, ./datatypes, ./digest, ./helpers diff --git a/beacon_chain/ssz.nim b/beacon_chain/ssz.nim index 60dde36b5..a77682b73 100644 --- a/beacon_chain/ssz.nim +++ b/beacon_chain/ssz.nim @@ -10,7 +10,7 @@ import endians, typetraits, options, algorithm, - eth_common, nimcrypto/blake2, + eth/common, nimcrypto/blake2, ./spec/[crypto, datatypes, digest] # ################### Helper functions ################################### diff --git a/beacon_chain/sync_protocol.nim b/beacon_chain/sync_protocol.nim index f4f3de4c8..837657ba3 100644 --- a/beacon_chain/sync_protocol.nim +++ b/beacon_chain/sync_protocol.nim @@ -1,6 +1,6 @@ import options, - chronicles, rlp, asyncdispatch2, ranges/bitranges, eth_p2p, eth_p2p/rlpx, + chronicles, eth/[rlp, p2p], asyncdispatch2, ranges/bitranges, eth/p2p/rlpx, spec/[datatypes, crypto, digest] type diff --git a/research/sereth.nim b/research/sereth.nim index 84d07adcc..3647a2fdb 100644 --- a/research/sereth.nim +++ b/research/sereth.nim @@ -1,6 +1,6 @@ import json, macros, sequtils, endians, - eth_common, stint, nimcrypto, byteutils + eth/common, stint, nimcrypto, byteutils type Validator {.packed.} = object diff --git a/tests/test_ssz.nim b/tests/test_ssz.nim index cf65e1d9f..9c15d0980 100644 --- a/tests/test_ssz.nim +++ b/tests/test_ssz.nim @@ -6,7 +6,7 @@ # at your option. This file may not be copied, modified, or distributed except according to those terms. import - unittest, nimcrypto, eth_common, sequtils, options, blscurve, + unittest, nimcrypto, eth/common, sequtils, options, blscurve, ../beacon_chain/ssz, ../beacon_chain/spec/datatypes func filled[N: static[int], T](typ: type array[N, T], value: T): array[N, T] =