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

wakuPost -> wakuPublish and change sig

This commit is contained in:
Oskar Thoren 2020-05-22 15:28:51 +08:00
parent 444da6a80a
commit bcf6ec95ed
No known key found for this signature in database
GPG Key ID: B2ECCFD3BC2EF77E
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,5 +35,6 @@ waitFor node2.connect("localhost", Port(8548))
let version = waitFor node1.wakuVersion() let version = waitFor node1.wakuVersion()
let res = waitFor node1.wakuPost("hello world") let res = waitFor node1.wakuPost("hello world")
let res2 = waitFor node1.wakuPublish("foobar", "hello world")
info "Version is", version info "Version is", version

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

@ -1,6 +1,6 @@
# Alpha - Currently implemented in v2 # Alpha - Currently implemented in v2
proc waku_version(): string proc waku_version(): string
proc waku_post(message: string): bool proc waku_publish(topic: string, message: string): bool
# NYI # NYI
proc waku_info(): WakuInfo proc waku_info(): WakuInfo

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

@ -1,8 +1,6 @@
import import
json_rpc/rpcserver, tables, options, json_rpc/rpcserver, tables, options,
eth/[common, rlp, keys, p2p], eth/[common, rlp, keys, p2p],
#DevP2P impl
# ../../../protocol/v1/waku_protocol,
../../../protocol/v2/waku_protocol, ../../../protocol/v2/waku_protocol,
nimcrypto/[sysrand, hmac, sha2, pbkdf2], nimcrypto/[sysrand, hmac, sha2, pbkdf2],
../../v1/rpc/[rpc_types, hexstrings, key_storage], ../../v1/rpc/[rpc_types, hexstrings, key_storage],
@ -25,20 +23,19 @@ proc setupWakuRPC*(wakuProto: WakuProto, rpcsrv: RpcServer) =
## Returns string of the current Waku protocol version. ## Returns string of the current Waku protocol version.
result = WakuSubCodec result = WakuSubCodec
# XXX Type
# TODO: Implement symkey etc logic # TODO: Implement symkey etc logic
rpcsrv.rpc("waku_post") do(message: string) -> bool: rpcsrv.rpc("waku_publish") do(topic: string, message: string) -> bool:
let data = cast[seq[byte]](message) let data = cast[seq[byte]](message)
# Assumes someone subscribing on this topic # Assumes someone subscribing on this topic
#let wakuSub = wakuProto.switch.pubsub #let wakuSub = wakuProto.switch.pubsub
let wakuSub = cast[WakuSub](wakuProto.switch.pubSub.get()) let wakuSub = cast[WakuSub](wakuProto.switch.pubSub.get())
# XXX also future return type # XXX also future return type
discard wakuSub.publish("foobar", data) discard wakuSub.publish(topic, data)
return true
#if not result:
# raise newException(ValueError, "Message could not be posted")
return true return true
#if not result: #if not result:
# raise newException(ValueError, "Message could not be posted") # raise newException(ValueError, "Message could not be posted")
# TODO: Dial/Connect
# XXX: Though wrong layer for that - wait how does this work in devp2p sim?
# We connect to nodes there, should be very similar here