codex-storage/nim-codex
1
0
Fork 0
mirror of https://github.com/codex-storage/nim-codex.git synced 2025-02-08 02:55:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

misc style changes

Browse Source
This commit is contained in:
Dmitriy Ryajov 2022-04-19 19:13:47 -06:00
parent 259a9adcff
commit 110c61de36
No known key found for this signature in database
GPG Key ID: DA8C680CE7C657A4
2 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dagger/blockexchange/network.nim
View File

@ -120,14 +120,16 @@ proc broadcastWantList*(
trace "Sending want list to peer", peer = id, `type` = $wantType, len = cids.len trace "Sending want list to peer", peer = id, `type` = $wantType, len = cids.len
let wantList = makeWantList( let
cids, wantList = makeWantList(
priority, cids,
cancel, priority,
wantType, cancel,
full, wantType,
sendDontHave) full,
b.peers[id].broadcast(Message(wantlist: wantList)) sendDontHave)
b.peers.withValue(id, peer):
peer[].broadcast(Message(wantlist: wantList))
proc handleBlocks( proc handleBlocks(
b: BlockExcNetwork, b: BlockExcNetwork,
@ -153,9 +155,7 @@ proc handleBlocks(
b.handlers.onBlocks(peer.id, blks) b.handlers.onBlocks(peer.id, blks)
template makeBlocks*( template makeBlocks*(blocks: seq[bt.Block]): seq[pb.Block] =
blocks: seq[bt.Block]):
seq[pb.Block] =
var blks: seq[pb.Block] var blks: seq[pb.Block]
for blk in blocks: for blk in blocks:
blks.add(pb.Block( blks.add(pb.Block(
@ -176,7 +176,8 @@ proc broadcastBlocks*(
return return
trace "Sending blocks to peer", peer = id, len = blocks.len trace "Sending blocks to peer", peer = id, len = blocks.len
b.peers[id].broadcast(pb.Message(payload: makeBlocks(blocks))) b.peers.withValue(id, peer):
peer[].broadcast(pb.Message(payload: makeBlocks(blocks)))
proc handleBlockPresence( proc handleBlockPresence(
b: BlockExcNetwork, b: BlockExcNetwork,
@ -202,7 +203,8 @@ proc broadcastBlockPresence*(
return return
trace "Sending presence to peer", peer = id trace "Sending presence to peer", peer = id
b.peers[id].broadcast(Message(blockPresences: presence)) b.peers.withValue(id, peer):
peer[].broadcast(Message(blockPresences: @presence))
proc handleAccount(network: BlockExcNetwork, proc handleAccount(network: BlockExcNetwork,
peer: NetworkPeer, peer: NetworkPeer,
@ -218,7 +220,8 @@ proc broadcastAccount*(network: BlockExcNetwork,
return return
let message = Message(account: AccountMessage.init(account)) let message = Message(account: AccountMessage.init(account))
network.peers[id].broadcast(message) network.peers.withValue(id, peer):
peer[].broadcast(message)
proc broadcastPayment*(network: BlockExcNetwork, proc broadcastPayment*(network: BlockExcNetwork,
id: PeerId, id: PeerId,
@ -227,7 +230,8 @@ proc broadcastPayment*(network: BlockExcNetwork,
return return
let message = Message(payment: StateChannelUpdate.init(payment)) let message = Message(payment: StateChannelUpdate.init(payment))
network.peers[id].broadcast(message) network.peers.withValue(id, peer):
peer[].broadcast(message)
proc handlePayment(network: BlockExcNetwork, proc handlePayment(network: BlockExcNetwork,
peer: NetworkPeer, peer: NetworkPeer,
@ -261,7 +265,7 @@ proc getOrCreatePeer(b: BlockExcNetwork, peer: PeerID): NetworkPeer =
## ##
if peer in b.peers: if peer in b.peers:
return b.peers[peer] return b.peers.getOrDefault(peer, nil)
var getConn = proc(): Future[Connection] {.async.} = var getConn = proc(): Future[Connection] {.async.} =
try: try:
@ -363,8 +367,7 @@ proc new*(
sendBlocks: sendBlocks, sendBlocks: sendBlocks,
sendPresence: sendPresence, sendPresence: sendPresence,
sendAccount: sendAccount, sendAccount: sendAccount,
sendPayment: sendPayment sendPayment: sendPayment)
)
b.init() b.init()
return b return b

12
dagger/blockexchange/peercontext.nim
View File

@ -13,12 +13,12 @@ export payments, nitro
type type
BlockExcPeerCtx* = ref object of RootObj BlockExcPeerCtx* = ref object of RootObj
id*: PeerID id*: PeerID
peerPrices*: Table[Cid, UInt256] # remote peer have list including price peerPrices*: Table[Cid, UInt256] # remote peer have list including price
peerWants*: seq[Entry] # remote peers want lists peerWants*: seq[Entry] # remote peers want lists
exchanged*: int # times peer has exchanged with us exchanged*: int # times peer has exchanged with us
lastExchange*: Moment # last time peer has exchanged with us lastExchange*: Moment # last time peer has exchanged with us
account*: ?Account # ethereum account of this peer account*: ?Account # ethereum account of this peer
paymentChannel*: ?ChannelId # payment channel id paymentChannel*: ?ChannelId # payment channel id
proc peerHave*(context: BlockExcPeerCtx): seq[Cid] = proc peerHave*(context: BlockExcPeerCtx): seq[Cid] =
toSeq(context.peerPrices.keys) toSeq(context.peerPrices.keys)