From 5aa6ccbad59c8107b4a8dc161bcc8110b177782b Mon Sep 17 00:00:00 2001
From: Brian Tiger Chow <brian.holderchow@gmail.com>
Date: Fri, 19 Sep 2014 15:44:11 -0700
Subject: [PATCH] refac(bitswap) nil slices are 'range'able
---
exchange/bitswap/bitswap.go | 40 +++++++++++++++++--------------------
1 file changed, 18 insertions(+), 22 deletions(-)
diff --git a/exchange/bitswap/bitswap.go b/exchange/bitswap/bitswap.go
index 3ee87106..84cb52eb 100644
--- a/exchange/bitswap/bitswap.go
+++ b/exchange/bitswap/bitswap.go
@@ -117,32 +117,28 @@ func (bs *bitswap) ReceiveMessage(
bs.strategy.MessageReceived(p, incoming)
- if incoming.Blocks() != nil {
- for _, block := range incoming.Blocks() {
- err := bs.blockstore.Put(block) // FIXME(brian): err ignored
- if err != nil {
- return nil, nil, err
- }
- bs.notifications.Publish(block)
- err = bs.HasBlock(ctx, block) // FIXME err ignored
- if err != nil {
- return nil, nil, err
- }
+ for _, block := range incoming.Blocks() {
+ err := bs.blockstore.Put(block) // FIXME(brian): err ignored
+ if err != nil {
+ return nil, nil, err
+ }
+ bs.notifications.Publish(block)
+ err = bs.HasBlock(ctx, block) // FIXME err ignored
+ if err != nil {
+ return nil, nil, err
}
}
- if incoming.Wantlist() != nil {
- for _, key := range incoming.Wantlist() {
- if bs.strategy.ShouldSendBlockToPeer(key, p) {
- block, errBlockNotFound := bs.blockstore.Get(key)
- if errBlockNotFound != nil {
- return nil, nil, errBlockNotFound
- }
- message := bsmsg.New()
- message.AppendBlock(*block)
- defer bs.strategy.MessageSent(p, message)
- return p, message, nil
+ for _, key := range incoming.Wantlist() {
+ if bs.strategy.ShouldSendBlockToPeer(key, p) {
+ block, errBlockNotFound := bs.blockstore.Get(key)
+ if errBlockNotFound != nil {
+ return nil, nil, errBlockNotFound
}
+ message := bsmsg.New()
+ message.AppendBlock(*block)
+ defer bs.strategy.MessageSent(p, message)
+ return p, message, nil
}
}
return nil, nil, nil
--
GitLab