Do not use unkeyed struct declarations

ipfs · Mar 2, 2022 · d6b4f4b · d6b4f4b
1 parent 4b8b354
commit d6b4f4b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/arc_cache.go b/arc_cache.go
@@ -139,15 +139,15 @@ func (b *arccache) Has(ctx context.Context, k cid.Cid) (bool, error) {
 
 func (b *arccache) GetSize(ctx context.Context, k cid.Cid) (int, error) {
 	if !k.Defined() {
-		return -1, ipld.ErrNotFound{k}
+		return -1, ipld.ErrNotFound{Cid: k}
 	}
 
 	key := cacheKey(k)
 
 	if has, blockSize, ok := b.queryCache(key); ok {
 		if !has {
 			// don't have it, return
-			return -1, ipld.ErrNotFound{k}
+			return -1, ipld.ErrNotFound{Cid: k}
 		}
 		if blockSize >= 0 {
 			// have it and we know the size
@@ -180,15 +180,15 @@ func (b *arccache) View(ctx context.Context, k cid.Cid, callback func([]byte) er
 	}
 
 	if !k.Defined() {
-		return ipld.ErrNotFound{k}
+		return ipld.ErrNotFound{Cid: k}
 	}
 
 	key := cacheKey(k)
 
 	if has, _, ok := b.queryCache(key); ok && !has {
 		// short circuit if the cache deterministically tells us the item
 		// doesn't exist.
-		return ipld.ErrNotFound{k}
+		return ipld.ErrNotFound{Cid: k}
 	}
 
 	b.lock(key, false)
@@ -214,13 +214,13 @@ func (b *arccache) View(ctx context.Context, k cid.Cid, callback func([]byte) er
 
 func (b *arccache) Get(ctx context.Context, k cid.Cid) (blocks.Block, error) {
 	if !k.Defined() {
-		return nil, ipld.ErrNotFound{k}
+		return nil, ipld.ErrNotFound{Cid: k}
 	}
 
 	key := cacheKey(k)
 
 	if has, _, ok := b.queryCache(key); ok && !has {
-		return nil, ipld.ErrNotFound{k}
+		return nil, ipld.ErrNotFound{Cid: k}
 	}
 
 	b.lock(key, false)

diff --git a/bloom_cache.go b/bloom_cache.go
@@ -157,7 +157,7 @@ func (b *bloomcache) Has(ctx context.Context, k cid.Cid) (bool, error) {
 
 func (b *bloomcache) GetSize(ctx context.Context, k cid.Cid) (int, error) {
 	if has, ok := b.hasCached(k); ok && !has {
-		return -1, ipld.ErrNotFound{k}
+		return -1, ipld.ErrNotFound{Cid: k}
 	}
 
 	return b.blockstore.GetSize(ctx, k)
@@ -173,14 +173,14 @@ func (b *bloomcache) View(ctx context.Context, k cid.Cid, callback func([]byte)
 	}
 
 	if has, ok := b.hasCached(k); ok && !has {
-		return ipld.ErrNotFound{k}
+		return ipld.ErrNotFound{Cid: k}
 	}
 	return b.viewer.View(ctx, k, callback)
 }
 
 func (b *bloomcache) Get(ctx context.Context, k cid.Cid) (blocks.Block, error) {
 	if has, ok := b.hasCached(k); ok && !has {
-		return nil, ipld.ErrNotFound{k}
+		return nil, ipld.ErrNotFound{Cid: k}
 	}
 
 	return b.blockstore.Get(ctx, k)