Commit 2ee030b6 authored by Brian Tiger Chow's avatar Brian Tiger Chow Committed by Jeromy

refactor(bitswap) perform Publish in HasBlock

License: MIT
Signed-off-by: default avatarBrian Tiger Chow <brian@perfmode.com>
parent 2be5de8f
...@@ -224,8 +224,10 @@ func (bs *bitswap) loop(parent context.Context) { ...@@ -224,8 +224,10 @@ func (bs *bitswap) loop(parent context.Context) {
// HasBlock announces the existance of a block to this bitswap service. The // HasBlock announces the existance of a block to this bitswap service. The
// service will potentially notify its peers. // service will potentially notify its peers.
func (bs *bitswap) HasBlock(ctx context.Context, blk *blocks.Block) error { func (bs *bitswap) HasBlock(ctx context.Context, blk *blocks.Block) error {
// TODO check all errors
log.Debugf("Has Block %s", blk.Key()) log.Debugf("Has Block %s", blk.Key())
bs.wantlist.Remove(blk.Key()) bs.wantlist.Remove(blk.Key())
bs.notifications.Publish(blk)
bs.sendToPeersThatWant(ctx, blk) bs.sendToPeersThatWant(ctx, blk)
return bs.routing.Provide(ctx, blk.Key()) return bs.routing.Provide(ctx, blk.Key())
} }
...@@ -258,8 +260,6 @@ func (bs *bitswap) ReceiveMessage(ctx context.Context, p peer.Peer, incoming bsm ...@@ -258,8 +260,6 @@ func (bs *bitswap) ReceiveMessage(ctx context.Context, p peer.Peer, incoming bsm
log.Criticalf("error putting block: %s", err) log.Criticalf("error putting block: %s", err)
continue // FIXME(brian): err ignored continue // FIXME(brian): err ignored
} }
bs.notifications.Publish(block)
bs.wantlist.Remove(block.Key())
err := bs.HasBlock(ctx, block) err := bs.HasBlock(ctx, block)
if err != nil { if err != nil {
log.Warningf("HasBlock errored: %s", err) log.Warningf("HasBlock errored: %s", err)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment