X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6eb3d1fb8fe71623fa63da46c250184cf2e4fbb8..7c9991300ecb9ca57bbe1cb4182ef76d1a645487:/services/datamanager/collection/collection_test.go

diff --git a/services/datamanager/collection/collection_test.go b/services/datamanager/collection/collection_test.go
index 3dc8e37dff..1669bb7784 100644
--- a/services/datamanager/collection/collection_test.go
+++ b/services/datamanager/collection/collection_test.go
@@ -20,9 +20,9 @@ var _ = Suite(&MySuite{})
 // indeterminate, we replace BlockToCollectionIndices with
 // BlockToCollectionUuids.
 type ExpectedSummary struct {
-	OwnerToCollectionSize  map[string]int
-	BlockToReplication     map[blockdigest.BlockDigest]int
-	BlockToCollectionUuids map[blockdigest.BlockDigest][]string
+	OwnerToCollectionSize     map[string]int
+	BlockToDesiredReplication map[blockdigest.DigestWithSize]int
+	BlockToCollectionUuids    map[blockdigest.DigestWithSize][]string
 }
 
 func CompareSummarizedReadCollections(c *C,
@@ -32,11 +32,11 @@ func CompareSummarizedReadCollections(c *C,
 	c.Assert(summarized.OwnerToCollectionSize, DeepEquals,
 		expected.OwnerToCollectionSize)
 
-	c.Assert(summarized.BlockToReplication, DeepEquals,
-		expected.BlockToReplication)
+	c.Assert(summarized.BlockToDesiredReplication, DeepEquals,
+		expected.BlockToDesiredReplication)
 
 	summarizedBlockToCollectionUuids :=
-		make(map[blockdigest.BlockDigest]map[string]struct{})
+		make(map[blockdigest.DigestWithSize]map[string]struct{})
 	for digest, indices := range summarized.BlockToCollectionIndices {
 		uuidSet := make(map[string]struct{})
 		summarizedBlockToCollectionUuids[digest] = uuidSet
@@ -46,7 +46,7 @@ func CompareSummarizedReadCollections(c *C,
 	}
 
 	expectedBlockToCollectionUuids :=
-		make(map[blockdigest.BlockDigest]map[string]struct{})
+		make(map[blockdigest.DigestWithSize]map[string]struct{})
 	for digest, uuidSlice := range expected.BlockToCollectionUuids {
 		uuidSet := make(map[string]struct{})
 		expectedBlockToCollectionUuids[digest] = uuidSet
@@ -69,13 +69,13 @@ func (s *MySuite) TestSummarizeSimple(checker *C) {
 
 	c := rc.UuidToCollection["col0"]
 
-	blockDigest1 := blockdigest.MakeTestBlockDigest(1)
-	blockDigest2 := blockdigest.MakeTestBlockDigest(2)
+	blockDigest1 := blockdigest.MakeTestDigestWithSize(1)
+	blockDigest2 := blockdigest.MakeTestDigestWithSize(2)
 
 	expected := ExpectedSummary{
-		OwnerToCollectionSize:  map[string]int{c.OwnerUuid: c.TotalSize},
-		BlockToReplication:     map[blockdigest.BlockDigest]int{blockDigest1: 5, blockDigest2: 5},
-		BlockToCollectionUuids: map[blockdigest.BlockDigest][]string{blockDigest1: []string{c.Uuid}, blockDigest2: []string{c.Uuid}},
+		OwnerToCollectionSize:     map[string]int{c.OwnerUuid: c.TotalSize},
+		BlockToDesiredReplication: map[blockdigest.DigestWithSize]int{blockDigest1: 5, blockDigest2: 5},
+		BlockToCollectionUuids:    map[blockdigest.DigestWithSize][]string{blockDigest1: []string{c.Uuid}, blockDigest2: []string{c.Uuid}},
 	}
 
 	CompareSummarizedReadCollections(checker, rc, expected)
@@ -98,21 +98,21 @@ func (s *MySuite) TestSummarizeOverlapping(checker *C) {
 	c0 := rc.UuidToCollection["col0"]
 	c1 := rc.UuidToCollection["col1"]
 
-	blockDigest1 := blockdigest.MakeTestBlockDigest(1)
-	blockDigest2 := blockdigest.MakeTestBlockDigest(2)
-	blockDigest3 := blockdigest.MakeTestBlockDigest(3)
+	blockDigest1 := blockdigest.MakeTestDigestWithSize(1)
+	blockDigest2 := blockdigest.MakeTestDigestWithSize(2)
+	blockDigest3 := blockdigest.MakeTestDigestWithSize(3)
 
 	expected := ExpectedSummary{
 		OwnerToCollectionSize: map[string]int{
 			c0.OwnerUuid: c0.TotalSize,
 			c1.OwnerUuid: c1.TotalSize,
 		},
-		BlockToReplication: map[blockdigest.BlockDigest]int{
+		BlockToDesiredReplication: map[blockdigest.DigestWithSize]int{
 			blockDigest1: 5,
 			blockDigest2: 8,
 			blockDigest3: 8,
 		},
-		BlockToCollectionUuids: map[blockdigest.BlockDigest][]string{
+		BlockToCollectionUuids: map[blockdigest.DigestWithSize][]string{
 			blockDigest1: []string{c0.Uuid},
 			blockDigest2: []string{c0.Uuid, c1.Uuid},
 			blockDigest3: []string{c1.Uuid},