X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/53f785c298338645b6880f22f26b0c36a7cfab4d..c3e2a93527a137fbeb3e2bb13c5ab344a95ab47f:/services/datamanager/summary/summary_test.go

diff --git a/services/datamanager/summary/summary_test.go b/services/datamanager/summary/summary_test.go
index 04ca5a5c59..cc4eb92560 100644
--- a/services/datamanager/summary/summary_test.go
+++ b/services/datamanager/summary/summary_test.go
@@ -12,7 +12,7 @@ import (
 func BlockSetFromSlice(digests []int) (bs BlockSet) {
 	bs = make(BlockSet)
 	for _, digest := range digests {
-		bs.Insert(blockdigest.MakeTestBlockDigest(digest))
+		bs.Insert(blockdigest.MakeTestDigestWithSize(digest))
 	}
 	return
 }
@@ -46,9 +46,9 @@ func SummarizeReplication(readCollections collection.ReadCollections,
 // Takes a map from block digest to replication level and represents
 // it in a keep.ReadServers structure.
 func SpecifyReplication(digestToReplication map[int]int) (rs keep.ReadServers) {
-	rs.BlockToServers = make(map[blockdigest.BlockDigest][]keep.BlockServerInfo)
+	rs.BlockToServers = make(map[blockdigest.DigestWithSize][]keep.BlockServerInfo)
 	for digest, replication := range digestToReplication {
-		rs.BlockToServers[blockdigest.MakeTestBlockDigest(digest)] =
+		rs.BlockToServers[blockdigest.MakeTestDigestWithSize(digest)] =
 			make([]keep.BlockServerInfo, replication)
 	}
 	return
@@ -66,10 +66,10 @@ func VerifyToCollectionIndexSet(
 	expected := CollectionIndexSetFromSlice(expectedCollections)
 
 	rc := collection.ReadCollections{
-		BlockToCollectionIndices: map[blockdigest.BlockDigest][]int{},
+		BlockToCollectionIndices: map[blockdigest.DigestWithSize][]int{},
 	}
 	for digest, indices := range blockToCollectionIndices {
-		rc.BlockToCollectionIndices[blockdigest.MakeTestBlockDigest(digest)] = indices
+		rc.BlockToCollectionIndices[blockdigest.MakeTestDigestWithSize(digest)] = indices
 	}
 
 	returned := make(CollectionIndexSet)
@@ -215,6 +215,6 @@ func TestMixedReplication(t *testing.T) {
 	returnedSummary := SummarizeReplication(rc, keepInfo)
 
 	if !reflect.DeepEqual(returnedSummary, expectedSummary) {
-		t.Fatalf("Expected returnedSummary to look like: \n%+v but instead it is: \n%+v. Index to UUID is %v. BlockToCollectionIndices is %v.", expectedSummary, returnedSummary, rc.CollectionIndexToUuid, rc.BlockToCollectionIndices)
+		t.Fatalf("Expected returnedSummary to look like: \n%+v but instead it is: \n%+v. Index to UUID is %v. BlockToCollectionIndices is %v.", expectedSummary, returnedSummary, rc.CollectionIndexToUUID, rc.BlockToCollectionIndices)
 	}
 }