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

More cleanup

This commit is contained in:
Oskar Thoren 2020-05-27 12:25:02 +08:00
parent 971c7a262b
commit 4f4f623b96
No known key found for this signature in database
GPG Key ID: B2ECCFD3BC2EF77E
2 changed files with 26 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,6 @@
import import
os, strformat, chronicles, json_rpc/[rpcclient, rpcserver], nimcrypto/sysrand, os, strformat, chronicles, json_rpc/[rpcclient, rpcserver], nimcrypto/sysrand,
eth/common as eth_common, eth/keys, eth/common as eth_common, eth/keys,
# XXX: Replace me
../../protocol/v1/waku_protocol,
../v1/rpc/[hexstrings, rpc_types], ../v1/rpc/[hexstrings, rpc_types],
options as what # TODO: Huh? Redefinition? options as what # TODO: Huh? Redefinition?
@ -13,18 +11,9 @@ template sourceDir: string = currentSourcePath.rsplit(DirSep, 1)[0]
const sigWakuPath = &"{sourceDir}{DirSep}rpc{DirSep}wakucallsigs.nim" const sigWakuPath = &"{sourceDir}{DirSep}rpc{DirSep}wakucallsigs.nim"
createRpcSigs(RpcHttpClient, sigWakuPath) createRpcSigs(RpcHttpClient, sigWakuPath)
# More minimal than v1 quicksim, just RPC client for now
let node1 = newRpcHttpClient() let node1 = newRpcHttpClient()
let node2 = newRpcHttpClient() let node2 = newRpcHttpClient()
# Where do we connect nodes here? Protocol so not RPC based, maybe?
# Using with static nodes, hardcoded "works":
# /ip4/127.0.0.1/tcp/55505/ipfs/16Uiu2HAkufRTzUnYCMggjPaAMbC3ss1bkrjewPcjwSeqK9WgUKYu
# Need to figure out rw stuff as well, perhaps we can start a few nodes and see if we get some pingpong
# Unclear how to mount waku on top of gossipsub tho
info "Hello there" info "Hello there"
# portsShift=2 # portsShift=2

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

@ -5,29 +5,29 @@ proc waku_subscribe(topic: string): bool
#proc waku_subscribe(topic: string, handler: Topichandler): bool #proc waku_subscribe(topic: string, handler: Topichandler): bool
# NYI # NYI
proc waku_info(): WakuInfo #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
#
proc waku_newKeyPair(): Identifier #proc waku_newKeyPair(): Identifier
proc waku_addPrivateKey(key: string): Identifier #proc waku_addPrivateKey(key: string): Identifier
proc waku_deleteKeyPair(id: Identifier): bool #proc waku_deleteKeyPair(id: Identifier): bool
proc waku_hasKeyPair(id: Identifier): bool #proc waku_hasKeyPair(id: Identifier): bool
proc waku_getPublicKey(id: Identifier): PublicKey #proc waku_getPublicKey(id: Identifier): PublicKey
proc waku_getPrivateKey(id: Identifier): PrivateKey #proc waku_getPrivateKey(id: Identifier): PrivateKey
#
proc waku_newSymKey(): Identifier #proc waku_newSymKey(): Identifier
proc waku_addSymKey(key: string): Identifier #proc waku_addSymKey(key: string): Identifier
proc waku_generateSymKeyFromPassword(password: string): Identifier #proc waku_generateSymKeyFromPassword(password: string): Identifier
proc waku_hasSymKey(id: Identifier): bool #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: WakuFilterOptions): 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[WakuFilterMessage] #proc waku_getFilterMessages(id: Identifier): seq[WakuFilterMessage]
#proc waku_post(message: WakuPostMessage): 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