Merge branch 'next' into mock-clock

2020-07-13 11:29:53 +01:00
parent 13de81b3b2 89a6b6842c
commit 973dbd6a13
20 changed files with 1622 additions and 352 deletions
@@ -8,7 +8,6 @@ import (

 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	"github.com/ipfs/go-datastore"
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
 )

@@ -63,7 +62,7 @@ func (m *multiReadBs) Get(cid cid.Cid) (blocks.Block, error) {
 	}

 	if merr == nil {
-		return nil, datastore.ErrNotFound
+		return nil, blockstore.ErrNotFound
 	}

 	return nil, merr