From b9e62a1f6c489ec7738517d08c44bff69f3bc383 Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Sun, 7 Jul 2019 11:53:58 +0200 Subject: [PATCH] std_shims -> stew --- beacon_chain.nimble | 5 ++--- beacon_chain/beacon_node.nim | 4 ++-- beacon_chain/eth2_network.nim | 2 +- beacon_chain/libp2p_backend.nim | 4 ++-- beacon_chain/libp2p_spec_backend.nim | 4 ++-- beacon_chain/spec/bitfield.nim | 4 ++-- beacon_chain/sync_protocol.nim | 2 +- research/sereth.nim | 2 +- tests/official/fixtures_utils.nim | 2 +- tests/official/test_fixture_bls.nim | 2 +- 10 files changed, 15 insertions(+), 16 deletions(-) diff --git a/beacon_chain.nimble b/beacon_chain.nimble index a3d0e448a..4c6c36c34 100644 --- a/beacon_chain.nimble +++ b/beacon_chain.nimble @@ -21,7 +21,7 @@ requires "nim >= 0.19.0", "eth", "nimcrypto", "blscurve", - "ranges", + "stew", "chronicles", "confutils", "serialization", @@ -29,8 +29,7 @@ requires "nim >= 0.19.0", "json_rpc", "chronos", "yaml", - "libp2p", - "byteutils" # test only (BitField and bytes datatypes deserialization) + "libp2p" ### Helper functions proc buildBinary(name: string, srcDir = "./", params = "", lang = "c") = diff --git a/beacon_chain/beacon_node.nim b/beacon_chain/beacon_node.nim index f6866a7ae..619aa6e2d 100644 --- a/beacon_chain/beacon_node.nim +++ b/beacon_chain/beacon_node.nim @@ -1,6 +1,6 @@ import net, sequtils, options, tables, osproc, random, strutils, times, strformat, - std_shims/[os_shims, objects], + stew/shims/os, stew/objects, chronos, chronicles, confutils, serialization/errors, eth/trie/db, eth/trie/backends/rocksdb_backend, eth/async_utils, spec/[bitfield, datatypes, digest, crypto, beaconstate, helpers, validator], @@ -692,7 +692,7 @@ proc run*(node: BeaconNode) = var gPidFile: string proc createPidFile(filename: string) = createDir splitFile(filename).dir - writeFile filename, $os_shims.getCurrentProcessId() + writeFile filename, $os.getCurrentProcessId() gPidFile = filename addQuitProc proc {.noconv.} = removeFile gPidFile diff --git a/beacon_chain/eth2_network.nim b/beacon_chain/eth2_network.nim index dd9df1a48..ee6d9d960 100644 --- a/beacon_chain/eth2_network.nim +++ b/beacon_chain/eth2_network.nim @@ -123,7 +123,7 @@ when networkBackend == rlpxBackend: else: import - os, random, std_shims/io, + os, random, stew/io, libp2p/crypto/crypto, libp2p/daemon/daemonapi, eth/async_utils, ssz diff --git a/beacon_chain/libp2p_backend.nim b/beacon_chain/libp2p_backend.nim index d20a55e45..8d87cd7de 100644 --- a/beacon_chain/libp2p_backend.nim +++ b/beacon_chain/libp2p_backend.nim @@ -1,6 +1,6 @@ import - macros, algorithm, tables, - std_shims/[macros_shim, tables_shims], chronos, chronicles, + algorithm, + stew/shims/[macros, tables], chronos, chronicles, libp2p/daemon/daemonapi, faststreams/output_stream, serialization, json_serialization/std/options, eth/p2p/p2p_protocol_dsl, libp2p_json_serialization, ssz diff --git a/beacon_chain/libp2p_spec_backend.nim b/beacon_chain/libp2p_spec_backend.nim index 548864f46..6678dbda2 100644 --- a/beacon_chain/libp2p_spec_backend.nim +++ b/beacon_chain/libp2p_spec_backend.nim @@ -1,6 +1,6 @@ import - tables, deques, options, algorithm, std_shims/[macros_shim, tables_shims], - ranges/ptr_arith, chronos, chronicles, serialization, faststreams/input_stream, + tables, deques, options, algorithm, stew/shims/[macros, tables], + stew/ranges/ptr_arith, chronos, chronicles, serialization, faststreams/input_stream, eth/async_utils, eth/p2p/p2p_protocol_dsl, libp2p/daemon/daemonapi, libp2p_json_serialization, ssz diff --git a/beacon_chain/spec/bitfield.nim b/beacon_chain/spec/bitfield.nim index 963590d25..4bd43970f 100644 --- a/beacon_chain/spec/bitfield.nim +++ b/beacon_chain/spec/bitfield.nim @@ -1,10 +1,10 @@ -import byteutils, json_serialization, std_shims/support/bitops2 +import stew/byteutils, json_serialization, stew/bitops2 type BitField* = object ## A simple bit field type that follows the semantics of the spec, with ## regards to bit endian operations - # TODO nim-ranges contains utilities for with bitsets - could try to + # TODO stew contains utilities for with bitsets - could try to # recycle that, but there are open questions about bit endianess there. bits*: seq[byte] diff --git a/beacon_chain/sync_protocol.nim b/beacon_chain/sync_protocol.nim index b7e95f740..047471d28 100644 --- a/beacon_chain/sync_protocol.nim +++ b/beacon_chain/sync_protocol.nim @@ -1,6 +1,6 @@ import options, tables, sequtils, algorithm, sets, macros, - chronicles, chronos, ranges/bitranges, + chronicles, chronos, stew/ranges/bitranges, spec/[datatypes, crypto, digest, helpers], eth/rlp, beacon_node_types, eth2_network, beacon_chain_db, block_pool, time, ssz diff --git a/research/sereth.nim b/research/sereth.nim index ed5695aac..656fc53b3 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, stew/byteutils type Validator {.packed.} = object diff --git a/tests/official/fixtures_utils.nim b/tests/official/fixtures_utils.nim index 5cff3a094..7b6d4a58d 100644 --- a/tests/official/fixtures_utils.nim +++ b/tests/official/fixtures_utils.nim @@ -1,6 +1,6 @@ import # Status libs - byteutils, + stew/byteutils, eth/common, serialization, json_serialization, # Beacon chain internals ../../beacon_chain/spec/datatypes diff --git a/tests/official/test_fixture_bls.nim b/tests/official/test_fixture_bls.nim index a3c3d827c..3d49f03ba 100644 --- a/tests/official/test_fixture_bls.nim +++ b/tests/official/test_fixture_bls.nim @@ -9,7 +9,7 @@ import # Standard libs ospaths, strutils, unittest, endians, # Status libs - blscurve, byteutils, + blscurve, stew/byteutils, # Beacon chain internals ../../beacon_chain/spec/crypto, # Test utilities