From 8f266cac109a60c25dd62959cc03127329fc2976 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 7 Jan 2020 09:34:11 -0800
Subject: [PATCH] feat: switch to raw multihashes for blocks

Part of: https://github.com/ipfs/go-ipfs/issues/6815
---
 arc_cache.go       |  6 +++---
 blockstore_test.go | 33 ++++++++++++++++++++++++++-------
 bloom_cache.go     |  8 ++++----
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/arc_cache.go b/arc_cache.go
index 8e88fa8..e2b930d 100644
--- a/arc_cache.go
+++ b/arc_cache.go
@@ -59,7 +59,7 @@ func (b *arccache) hasCached(k cid.Cid) (has bool, size int, ok bool) {
 		return false, -1, false
 	}
 
-	h, ok := b.arc.Get(k.KeyString())
+	h, ok := b.arc.Get(string(k.Hash()))
 	if ok {
 		b.hits.Inc()
 		switch h := h.(type) {
@@ -160,11 +160,11 @@ func (b *arccache) HashOnRead(enabled bool) {
 }
 
 func (b *arccache) cacheHave(c cid.Cid, have bool) {
-	b.arc.Add(c.KeyString(), cacheHave(have))
+	b.arc.Add(string(c.Hash()), cacheHave(have))
 }
 
 func (b *arccache) cacheSize(c cid.Cid, blockSize int) {
-	b.arc.Add(c.KeyString(), cacheSize(blockSize))
+	b.arc.Add(string(c.Hash()), cacheSize(blockSize))
 }
 
 func (b *arccache) AllKeysChan(ctx context.Context) (<-chan cid.Cid, error) {
diff --git a/blockstore_test.go b/blockstore_test.go
index 4422559..a165652 100644
--- a/blockstore_test.go
+++ b/blockstore_test.go
@@ -53,6 +53,24 @@ func TestPutThenGetBlock(t *testing.T) {
 	}
 }
 
+func TestCidv0v1(t *testing.T) {
+	bs := NewBlockstore(ds_sync.MutexWrap(ds.NewMapDatastore()))
+	block := blocks.NewBlock([]byte("some data"))
+
+	err := bs.Put(block)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	blockFromBlockstore, err := bs.Get(cid.NewCidV1(cid.DagProtobuf, block.Cid().Hash()))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !bytes.Equal(block.RawData(), blockFromBlockstore.RawData()) {
+		t.Fail()
+	}
+}
+
 func TestPutThenGetSizeBlock(t *testing.T) {
 	bs := NewBlockstore(ds_sync.MutexWrap(ds.NewMapDatastore()))
 	block := blocks.NewBlock([]byte("some data"))
@@ -218,18 +236,19 @@ func TestAllKeysRespectsContext(t *testing.T) {
 }
 
 func expectMatches(t *testing.T, expect, actual []cid.Cid) {
+	t.Helper()
 
 	if len(expect) != len(actual) {
 		t.Errorf("expect and actual differ: %d != %d", len(expect), len(actual))
 	}
+
+	actualSet := make(map[string]bool, len(actual))
+	for _, k := range actual {
+		actualSet[string(k.Hash())] = true
+	}
+
 	for _, ek := range expect {
-		found := false
-		for _, ak := range actual {
-			if ek.Equals(ak) {
-				found = true
-			}
-		}
-		if !found {
+		if !actualSet[string(ek.Hash())] {
 			t.Error("expected key not found: ", ek)
 		}
 	}
diff --git a/bloom_cache.go b/bloom_cache.go
index 6e28ece..b4fadc2 100644
--- a/bloom_cache.go
+++ b/bloom_cache.go
@@ -103,7 +103,7 @@ func (b *bloomcache) build(ctx context.Context) error {
 				atomic.StoreInt32(&b.active, 1)
 				return nil
 			}
-			b.bloom.AddTS(key.Bytes()) // Use binary key, the more compact the better
+			b.bloom.AddTS(key.Hash()) // Use binary key, the more compact the better
 		case <-ctx.Done():
 			b.buildErr = ctx.Err()
 			return b.buildErr
@@ -130,7 +130,7 @@ func (b *bloomcache) hasCached(k cid.Cid) (has bool, ok bool) {
 		return false, false
 	}
 	if b.BloomActive() {
-		blr := b.bloom.HasTS(k.Bytes())
+		blr := b.bloom.HasTS(k.Hash())
 		if !blr { // not contained in bloom is only conclusive answer bloom gives
 			b.hits.Inc()
 			return false, true
@@ -163,7 +163,7 @@ func (b *bloomcache) Put(bl blocks.Block) error {
 	// See comment in PutMany
 	err := b.blockstore.Put(bl)
 	if err == nil {
-		b.bloom.AddTS(bl.Cid().Bytes())
+		b.bloom.AddTS(bl.Cid().Hash())
 	}
 	return err
 }
@@ -178,7 +178,7 @@ func (b *bloomcache) PutMany(bs []blocks.Block) error {
 		return err
 	}
 	for _, bl := range bs {
-		b.bloom.AddTS(bl.Cid().Bytes())
+		b.bloom.AddTS(bl.Cid().Hash())
 	}
 	return nil
 }
-- 
GitLab