status-im
/
nim-eth
mirror of https://github.com/status-im/nim-eth.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix review comments, or not really, just add more TODOs

This commit is contained in:
kdeme 2019-12-12 14:43:05 +01:00 committed by zah
parent 7128df8838
commit b2656cc3a9
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eth/p2p/rlpx_protocols/waku_mail.nim
View File

@ -32,6 +32,9 @@ proc requestMail*(node: EthereumNode, peerId: NodeId, request: MailRequest,
# TODO: Perhaps don't go the recursive route or could use the actual response # TODO: Perhaps don't go the recursive route or could use the actual response
# proc to implement this (via a handler) and store the necessary data in the # proc to implement this (via a handler) and store the necessary data in the
# WakuPeer object. # WakuPeer object.
# TODO: Several requestMail calls in parallel can create issues with handling
# the wrong response to a request. Can additionaly check the requestId but
# that would only solve it half. Better to use the requestResponse mechanism.
# TODO: move this check out of requestMail? # TODO: move this check out of requestMail?
let peer = node.getPeer(peerId, Waku) let peer = node.getPeer(peerId, Waku)

14
eth/p2p/rlpx_protocols/waku_protocol.nim
View File

@ -83,6 +83,8 @@ type
# as is done for the P2P Request packet. If we could alter this in the spec it # as is done for the P2P Request packet. If we could alter this in the spec it
# would be a cleaner separation between Waku and Mail server / client and then # would be a cleaner separation between Waku and Mail server / client and then
# this could be moved to waku_mail.nim # this could be moved to waku_mail.nim
# Also, the requestId could live at layer lower. And the protocol DSL
# currently supports this, if used in a requestResponse block.
P2PRequestCompleteObject* = object P2PRequestCompleteObject* = object
requestId*: Hash requestId*: Hash
lastEnvelopeHash*: Hash lastEnvelopeHash*: Hash
@ -251,10 +253,12 @@ p2pProtocol Waku(version = wakuVersion,
proc p2pSyncResponse(peer: Peer) = discard proc p2pSyncResponse(peer: Peer) = discard
proc p2pRequestComplete(peer: Peer, data: P2PRequestCompleteObject) = discard proc p2pRequestComplete(peer: Peer, data: P2PRequestCompleteObject) = discard
# This is actually rather a requestResponse in combination with p2pRequest # TODO: This is actually rather a requestResponse in combination with
# However, we can't use that system due to the unfortunate fact that the # p2pRequest. However, we can't use that system due to the unfortunate fact
# packet IDs are not consecutive, and nextID is not recognized in between # that the packet IDs are not consecutive, and nextID is not recognized in
# these. # between these. The nextID behaviour could be fixed, however it would be
# cleaner if the specification could be changed to have these IDs to be
# consecutive.
# 'Runner' calls --------------------------------------------------------------- # 'Runner' calls ---------------------------------------------------------------
@ -363,7 +367,7 @@ proc postMessage*(node: EthereumNode, pubKey = none[PublicKey](),
# Allow lightnode to post only direct p2p messages # Allow lightnode to post only direct p2p messages
if targetPeer.isSome(): if targetPeer.isSome():
return node.sendP2PMessage(targetPeer.get(), @[env]) return node.sendP2PMessage(targetPeer.get(), [env])
elif not node.protocolState(Waku).config.isLightNode: elif not node.protocolState(Waku).config.isLightNode:
# non direct p2p message can not have ttl of 0 # non direct p2p message can not have ttl of 0
if env.ttl == 0: if env.ttl == 0: