Fix compilation issues when using peer.networkState

This commit is contained in:
Zahary Karadjov 2018-09-12 18:28:38 +03:00
parent f815c73963
commit d30dce9d53
1 changed files with 3 additions and 1 deletions

View File

@ -599,6 +599,7 @@ proc getNetworkState(peer: Peer, proto: ProtocolInfo): RootRef =
template networkState*(connection: Peer, Protocol: type): untyped = template networkState*(connection: Peer, Protocol: type): untyped =
## Returns the network state object of a particular protocol for a ## Returns the network state object of a particular protocol for a
## particular connection. ## particular connection.
bind getNetworkState
cast[ref Protocol.NetworkState](connection.getNetworkState(Protocol.protocolInfo)) cast[ref Protocol.NetworkState](connection.getNetworkState(Protocol.protocolInfo))
proc initProtocolState*[T](state: var T, x: Peer|EthereumNode) = discard proc initProtocolState*[T](state: var T, x: Peer|EthereumNode) = discard
@ -671,6 +672,7 @@ macro rlpxProtocol*(protoIdentifier: untyped,
startList = bindSym "startList" startList = bindSym "startList"
writeMsgId = bindSym "writeMsgId" writeMsgId = bindSym "writeMsgId"
getState = bindSym "getState" getState = bindSym "getState"
getNetworkState = bindSym "getNetworkState"
perPeerMsgId = bindSym "perPeerMsgId" perPeerMsgId = bindSym "perPeerMsgId"
linkSendFutureToResult = bindSym "linkSendFutureToResult" linkSendFutureToResult = bindSym "linkSendFutureToResult"
@ -700,7 +702,7 @@ macro rlpxProtocol*(protoIdentifier: untyped,
if networkStateType != nil: if networkStateType != nil:
var networkStateAccessor = quote: var networkStateAccessor = quote:
template networkState(p: `Peer`): ref `networkStateType` = template networkState(p: `Peer`): ref `networkStateType` =
cast[ref `networkStateType`](p.getNetworkState(`protocol`)) cast[ref `networkStateType`](`getNetworkState`(p, `protocol`))
userHandlerProc.body.insert 0, networkStateAccessor userHandlerProc.body.insert 0, networkStateAccessor