Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump nim-eth and move tests under v1 subfolder #3

Merged
merged 1 commit into from
May 8, 2020
Merged

Bump nim-eth and move tests under v1 subfolder #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions tests/all_tests.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import
./test_waku_connect,
./test_waku_config,
./test_waku_bridge,
./test_waku_mail,
./test_rpc_waku
./v1/test_waku_connect,
./v1/test_waku_config,
./v1/test_waku_bridge,
./v1/test_waku_mail,
./v1/test_rpc_waku

0 tests/test_helpers.nim → tests/v1/test_helpers.nim
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions tests/test_rpc_waku.nim → tests/v1/test_rpc_waku.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import
unittest, strformat, options, stew/byteutils, json_rpc/[rpcserver, rpcclient],
eth/common as eth_common, eth/[rlp, keys, p2p],
../waku/protocol/v1/waku_protocol,
../waku/node/v1/rpc/[hexstrings, rpc_types, waku, key_storage],
../../waku/protocol/v1/waku_protocol,
../../waku/node/v1/rpc/[hexstrings, rpc_types, waku, key_storage],
./test_helpers

from os import DirSep, ParDir

## Generate client convenience marshalling wrappers from forward declarations
## For testing, ethcallsigs needs to be kept in sync with ../waku/node/v1/rpc/waku
const sigPath = &"{sourceDir}{DirSep}{ParDir}{DirSep}waku{DirSep}node{DirSep}v1{DirSep}rpc{DirSep}wakucallsigs.nim"
const sigPath = &"{sourceDir}{DirSep}{ParDir}{DirSep}{ParDir}{DirSep}waku{DirSep}node{DirSep}v1{DirSep}rpc{DirSep}wakucallsigs.nim"
createRpcSigs(RpcSocketClient, sigPath)

proc setupNode(capabilities: varargs[ProtocolInfo, `protocolInfo`]): EthereumNode =
Expand Down
4 changes: 2 additions & 2 deletions tests/test_waku_bridge.nim → tests/v1/test_waku_bridge.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import
sequtils, unittest, tables, chronos, eth/p2p, eth/p2p/peer_pool,
eth/p2p/rlpx_protocols/whisper_protocol as whisper,
../waku/protocol/v1/waku_protocol as waku,
../waku/protocol/v1/waku_bridge,
../../waku/protocol/v1/waku_protocol as waku,
../../waku/protocol/v1/waku_bridge,
./test_helpers

let safeTTL = 5'u32
Expand Down
2 changes: 1 addition & 1 deletion tests/test_waku_config.nim → tests/v1/test_waku_config.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import
sequtils, options, unittest, times,
../waku/protocol/v1/waku_protocol
../../waku/protocol/v1/waku_protocol

suite "Waku envelope validation":
test "should validate and allow envelope according to config":
Expand Down
2 changes: 1 addition & 1 deletion tests/test_waku_connect.nim → tests/v1/test_waku_connect.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import
sequtils, tables, unittest, chronos, eth/[keys, p2p], eth/p2p/peer_pool,
../waku/protocol/v1/waku_protocol,
../../waku/protocol/v1/waku_protocol,
./test_helpers

const
Expand Down
2 changes: 1 addition & 1 deletion tests/test_waku_mail.nim → tests/v1/test_waku_mail.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import
unittest, chronos, tables, sequtils, times,
eth/[p2p, async_utils], eth/p2p/peer_pool,
../waku/protocol/v1/[waku_protocol, waku_mail],
../../waku/protocol/v1/[waku_protocol, waku_mail],
./test_helpers

const
Expand Down
2 changes: 1 addition & 1 deletion vendor/nim-eth
Open in desktop
Submodule nim-eth updated 17 files
+0 −3 eth.nimble
+136 −136 eth/p2p/discoveryv5/encoding.nim
+43 −29 eth/p2p/discoveryv5/enr.nim
+3 −2 eth/p2p/discoveryv5/hkdf.nim
+17 −18 eth/p2p/discoveryv5/node.nim
+80 −73 eth/p2p/discoveryv5/protocol.nim
+6 −7 eth/p2p/discoveryv5/routing_table.nim
+18 −18 eth/p2p/discoveryv5/types.nim
+0 −17 eth/p2p/rlpx_protocols/waku_bridge.nim
+0 −85 eth/p2p/rlpx_protocols/waku_mail.nim
+0 −648 eth/p2p/rlpx_protocols/waku_protocol.nim
+7 −7 tests/p2p/test_discoveryv5.nim
+14 −13 tests/p2p/test_discv5_encoding.nim
+3 −3 tests/p2p/test_enr.nim
+0 −95 tests/p2p/test_waku_bridge.nim
+0 −242 tests/p2p/test_waku_connect.nim
+0 −116 tests/p2p/test_waku_mail.nim
1 change: 0 additions & 1 deletion waku/node/v2/wakunode.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import
chronicles/topics_registry, # TODO: What? Need this for setLoglevel, weird.
eth/[keys, p2p, async_utils], eth/common/utils, eth/net/nat,
eth/p2p/[discovery, enode, peer_pool, bootnodes, whispernodes],
eth/p2p/rlpx_protocols/[whisper_protocol, waku_protocol, waku_bridge],
# TODO remove me
../v1/rpc/[wakusim, key_storage],
../../vendor/nim-libp2p/libp2p/standard_setup,
Expand Down