Merge pull request #78 from ipfs/update-bitswap

update go-bitswap to v0.3.4

.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  ci-go: ipfs/ci-go@0.1
+  ci-go: ipfs/ci-go@0.3.1
 
 workflows:
   version: 2

blockservice.go

@@ -147,7 +147,7 @@ func (s *blockService) AddBlock(o blocks.Block) error {
 		return err
 	}
 
-	log.Event(context.TODO(), "BlockService.BlockAdded", c)
+	log.Debugf("BlockService.BlockAdded %s", c)
 
 	if s.exchange != nil {
 		if err := s.exchange.HasBlock(o); err != nil {
@@ -193,7 +193,7 @@ func (s *blockService) AddBlocks(bs []blocks.Block) error {
 
 	if s.exchange != nil {
 		for _, o := range toput {
-			log.Event(context.TODO(), "BlockService.BlockAdded", o.Cid())
+			log.Debugf("BlockService.BlockAdded %s", o.Cid())
 			if err := s.exchange.HasBlock(o); err != nil {
 				log.Errorf("HasBlock: %s", err.Error())
 			}
@@ -243,7 +243,7 @@ func getBlock(ctx context.Context, c cid.Cid, bs blockstore.Blockstore, fget fun
 			}
 			return nil, err
 		}
-		log.Event(ctx, "BlockService.BlockFetched", c)
+		log.Debugf("BlockService.BlockFetched %s", c)
 		return blk, nil
 	}
 
@@ -320,7 +320,7 @@ func getBlocks(ctx context.Context, ks []cid.Cid, bs blockstore.Blockstore, fget
 		}
 
 		for b := range rblocks {
-			log.Event(ctx, "BlockService.BlockFetched", b.Cid())
+			log.Debugf("BlockService.BlockFetched %s", b.Cid())
 			select {
 			case out <- b:
 			case <-ctx.Done():
@@ -335,7 +335,7 @@ func getBlocks(ctx context.Context, ks []cid.Cid, bs blockstore.Blockstore, fget
 func (s *blockService) DeleteBlock(c cid.Cid) error {
 	err := s.blockstore.DeleteBlock(c)
 	if err == nil {
-		log.Event(context.TODO(), "BlockService.BlockDeleted", c)
+		log.Debugf("BlockService.BlockDeleted %s", c)
 	}
 	return err
 }

go.mod

@@ -3,17 +3,24 @@ module github.com/ipfs/go-blockservice
 go 1.13
 
 require (
-	github.com/ipfs/go-bitswap v0.1.8
-	github.com/ipfs/go-block-format v0.0.2
-	github.com/ipfs/go-cid v0.0.5
-	github.com/ipfs/go-datastore v0.4.4
-	github.com/ipfs/go-ipfs-blockstore v0.1.4
+	github.com/google/uuid v1.2.0 // indirect
+	github.com/ipfs/go-bitswap v0.3.4
+	github.com/ipfs/go-block-format v0.0.3
+	github.com/ipfs/go-cid v0.0.7
+	github.com/ipfs/go-datastore v0.4.5
+	github.com/ipfs/go-ipfs-blockstore v1.0.3
 	github.com/ipfs/go-ipfs-blocksutil v0.0.1
 	github.com/ipfs/go-ipfs-delay v0.0.1
 	github.com/ipfs/go-ipfs-exchange-interface v0.0.1
 	github.com/ipfs/go-ipfs-exchange-offline v0.0.1
 	github.com/ipfs/go-ipfs-routing v0.1.0
-	github.com/ipfs/go-ipfs-util v0.0.1
-	github.com/ipfs/go-log v0.0.1
+	github.com/ipfs/go-ipfs-util v0.0.2
+	github.com/ipfs/go-log v1.0.5
 	github.com/ipfs/go-verifcid v0.0.1
+	github.com/klauspost/cpuid/v2 v2.0.6 // indirect
+	github.com/libp2p/go-libp2p v0.14.0 // indirect
+	github.com/multiformats/go-multihash v0.0.15 // indirect
+	go.uber.org/multierr v1.7.0 // indirect
+	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
+	golang.org/x/sys v0.0.0-20210514084401-e8d321eab015 // indirect
 )