waku-org
/
nwaku
mirror of https://github.com/waku-org/nwaku.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add protocol2 target after rebase + fix some import paths

This commit is contained in:
kdeme 2020-05-01 12:05:19 +02:00
parent 87e4e5282a
commit 55538c7bf8
No known key found for this signature in database
GPG Key ID: 4E8DD21420AF43F5
6 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -38,7 +38,7 @@ GIT_SUBMODULE_UPDATE := git submodule update --init --recursive
else # "variables.mk" was included. Business as usual until the end of this file. else # "variables.mk" was included. Business as usual until the end of this file.
# default target, because it's the first one that doesn't start with '.' # default target, because it's the first one that doesn't start with '.'
all: | wakunode all: | wakunode wakusim
# must be included after the default target # must be included after the default target
-include $(BUILD_SYSTEM_DIR)/makefiles/targets.mk -include $(BUILD_SYSTEM_DIR)/makefiles/targets.mk
@ -77,6 +77,9 @@ wakusim2: | build deps wakunode2
echo -e $(BUILD_MSG) "build/$@" && \ echo -e $(BUILD_MSG) "build/$@" && \
$(ENV_SCRIPT) nim wakusim2 $(NIM_PARAMS) waku.nims $(ENV_SCRIPT) nim wakusim2 $(NIM_PARAMS) waku.nims
protocol2:
echo -e $(BUILD_MSG) "build/$@" && \
$(ENV_SCRIPT) nim protocol2 $(NIM_PARAMS) waku.nims
# symlink # symlink
waku.nims: waku.nims:
ln -s waku.nimble $@ ln -s waku.nimble $@

3
waku.nimble
View File

@ -47,6 +47,9 @@ task wakusim, "Build Waku simulation tools":
buildBinary "quicksim", "waku/node/v0/", "-d:chronicles_log_level=INFO" buildBinary "quicksim", "waku/node/v0/", "-d:chronicles_log_level=INFO"
buildBinary "start_network", "waku/node/v0/", "-d:chronicles_log_level=DEBUG" buildBinary "start_network", "waku/node/v0/", "-d:chronicles_log_level=DEBUG"
task protocol2, "Build the experimental Waku protocol":
buildBinary "waku_protocol", "waku/protocol/v2/", "-d:chronicles_log_level=DEBUG"
task wakunode2, "Build Experimental Waku cli": task wakunode2, "Build Experimental Waku cli":
buildBinary "wakunode", "waku/node/v2/", "-d:chronicles_log_level=TRACE" buildBinary "wakunode", "waku/node/v2/", "-d:chronicles_log_level=TRACE"

2
waku/node/v2/quicksim.nim
View File

@ -3,7 +3,7 @@ import
eth/common as eth_common, eth/keys, eth/common as eth_common, eth/keys,
# XXX: Replace me # XXX: Replace me
eth/p2p/rlpx_protocols/waku_protocol, eth/p2p/rlpx_protocols/waku_protocol,
../../vendor/nimbus/nimbus/rpc/[hexstrings, rpc_types, waku], ../v0/rpc/[hexstrings, rpc_types, waku],
rpc/wakurpc, rpc/wakurpc,
options as what # TODO: Huh? Redefinition? options as what # TODO: Huh? Redefinition?

8
waku/node/v2/rpc/wakucallsigs.nim
View File

@ -1,7 +1,7 @@
# NOTE: Taken from v0, only version exists right now # NOTE: Taken from v0, only version exists right now
proc waku_version(): string proc waku_version(): string
proc waku_info(): WhisperInfo proc waku_info(): WakuInfo
proc waku_setMaxMessageSize(size: uint64): bool proc waku_setMaxMessageSize(size: uint64): bool
proc waku_setMinPoW(pow: float): bool proc waku_setMinPoW(pow: float): bool
proc waku_markTrustedPeer(enode: string): bool proc waku_markTrustedPeer(enode: string): bool
@ -20,10 +20,10 @@ proc waku_hasSymKey(id: Identifier): bool
proc waku_getSymKey(id: Identifier): SymKey proc waku_getSymKey(id: Identifier): SymKey
proc waku_deleteSymKey(id: Identifier): bool proc waku_deleteSymKey(id: Identifier): bool
proc waku_newMessageFilter(options: WhisperFilterOptions): Identifier proc waku_newMessageFilter(options: WakuFilterOptions): Identifier
proc waku_deleteMessageFilter(id: Identifier): bool proc waku_deleteMessageFilter(id: Identifier): bool
proc waku_getFilterMessages(id: Identifier): seq[WhisperFilterMessage] proc waku_getFilterMessages(id: Identifier): seq[WakuFilterMessage]
proc waku_post(message: WhisperPostMessage): bool proc waku_post(message: WakuPostMessage): bool
proc wakusim_generateTraffic(amount: int): bool proc wakusim_generateTraffic(amount: int): bool
proc wakusim_generateRandomTraffic(amount: int): bool proc wakusim_generateRandomTraffic(amount: int): bool

4
waku/node/v2/rpc/wakurpc.nim
View File

@ -5,9 +5,7 @@ import
#eth/p2p/rlpx_protocols/waku_protocol, #eth/p2p/rlpx_protocols/waku_protocol,
../../../protocol/v2/waku_protocol, ../../../protocol/v2/waku_protocol,
nimcrypto/[sysrand, hmac, sha2, pbkdf2], nimcrypto/[sysrand, hmac, sha2, pbkdf2],
../../../vendor/nimbus/nimbus/rpc/rpc_types, ../../v0/rpc/[rpc_types, hexstrings, key_storage]
../../../vendor/nimbus/nimbus/rpc/hexstrings,
../../../vendor/nimbus/nimbus/rpc/key_storage
from stew/byteutils import hexToSeqByte, hexToByteArray from stew/byteutils import hexToSeqByte, hexToByteArray

2
waku/node/v2/wakunode.nim
View File

@ -5,7 +5,7 @@ import
eth/p2p/[discovery, enode, peer_pool, bootnodes, whispernodes], eth/p2p/[discovery, enode, peer_pool, bootnodes, whispernodes],
eth/p2p/rlpx_protocols/[whisper_protocol, waku_protocol, waku_bridge], eth/p2p/rlpx_protocols/[whisper_protocol, waku_protocol, waku_bridge],
# TODO remove me # TODO remove me
../../vendor/nimbus/nimbus/rpc/[wakusim, key_storage], ../v0/rpc/[wakusim, key_storage],
../../vendor/nim-libp2p/libp2p/standard_setup, ../../vendor/nim-libp2p/libp2p/standard_setup,
../../vendor/nim-libp2p/libp2p/multiaddress, ../../vendor/nim-libp2p/libp2p/multiaddress,
../../vendor/nim-libp2p/libp2p/crypto/crypto, ../../vendor/nim-libp2p/libp2p/crypto/crypto,