From 4d8eddcebccce65bcd9c08edc743c84c2f9db68d Mon Sep 17 00:00:00 2001 From: Jeromy Date: Fri, 4 Sep 2015 15:41:15 -0700 Subject: [PATCH] fix blockservice error ignorance License: MIT Signed-off-by: Jeromy --- blockservice/blockservice.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/blockservice/blockservice.go b/blockservice/blockservice.go index bfc6394f1..0b00b4e8c 100644 --- a/blockservice/blockservice.go +++ b/blockservice/blockservice.go @@ -96,19 +96,25 @@ func (s *BlockService) GetBlock(ctx context.Context, k key.Key) (*blocks.Block, block, err := s.Blockstore.Get(k) if err == nil { return block, nil + } + + if err == blockstore.ErrNotFound && s.Exchange != nil { // TODO be careful checking ErrNotFound. If the underlying // implementation changes, this will break. - } else if err == blockstore.ErrNotFound && s.Exchange != nil { log.Debug("Blockservice: Searching bitswap.") blk, err := s.Exchange.GetBlock(ctx, k) if err != nil { return nil, err } return blk, nil - } else { - log.Debug("Blockservice GetBlock: Not found.") + } + + log.Debug("Blockservice GetBlock: Not found.") + if err == blockstore.ErrNotFound { return nil, ErrNotFound } + + return nil, err } // GetBlocks gets a list of blocks asynchronously and returns through