Use digest.*.FromString where possible

... instead of doing the same thing manually. Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
containers · Feb 8, 2024 · e0e8045 · e0e8045
1 parent 2029a3b
commit e0e8045
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/oci/layout/oci_src_test.go b/oci/layout/oci_src_test.go
@@ -49,7 +49,7 @@ func TestGetBlobForRemoteLayers(t *testing.T) {
 	imageSource := createImageSource(t, &types.SystemContext{})
 	defer imageSource.Close()
 	layerInfo := types.BlobInfo{
-		Digest: digest.FromBytes([]byte("Hello world")),
+		Digest: digest.FromString("Hello world"),
 		Size:   -1,
 		URLs: []string{
 			"brokenurl",

diff --git a/storage/storage_dest.go b/storage/storage_dest.go
@@ -633,7 +633,7 @@ func (s *storageImageDestination) commitLayer(index int, info addedLayerInfo, si
 	}
 	id := diffIDOrTOCDigest.Hex()
 	if parentLayer != "" {
-		id = digest.Canonical.FromBytes([]byte(parentLayer + "+" + diffIDOrTOCDigest.Hex())).Hex()
+		id = digest.Canonical.FromString(parentLayer + "+" + diffIDOrTOCDigest.Hex()).Hex()
 	}
 	if layer, err2 := s.imageRef.transport.store.Layer(id); layer != nil && err2 == nil {
 		// There's already a layer that should have the right contents, just reuse it.