3 files changed, 1 insertions, 43 deletions
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index c3ec7dd8a..d469fa0ca 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -159,10 +159,6 @@ func (ir *ImageEngine) Mount(ctx context.Context, nameOrIDs []string, opts entit
 	mountReports := []*entities.ImageMountReport{}
 	listMountsOnly := !opts.All && len(nameOrIDs) == 0
 	for _, i := range images {
-		// TODO: the .Err fields are not used. This pre-dates the
-		// libimage migration but should be addressed at some point.
-		// A quick glimpse at cmd/podman/image/mount.go suggests that
-		// the errors needed to be handled there as well.
 		var mountPoint string
 		var err error
 		if listMountsOnly {
diff --git a/pkg/domain/infra/abi/images_list.go b/pkg/domain/infra/abi/images_list.go
index 9a0aaaf3a..8f5591e92 100644
--- a/pkg/domain/infra/abi/images_list.go
+++ b/pkg/domain/infra/abi/images_list.go
@@ -36,9 +36,7 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions)
 		}
 
 		e := entities.ImageSummary{
-			ID: img.ID(),
-			// TODO: libpod/image didn't set it but libimage should
-			// ConfigDigest: string(img.ConfigDigest),
+			ID:          img.ID(),
 			Created:     img.Created().Unix(),
 			Dangling:    isDangling,
 			Digest:      string(img.Digest()),
diff --git a/pkg/domain/infra/abi/images_test.go b/pkg/domain/infra/abi/images_test.go
index 311ab3ed7..3999de457 100644
--- a/pkg/domain/infra/abi/images_test.go
+++ b/pkg/domain/infra/abi/images_test.go
@@ -16,39 +16,3 @@ func TestToDomainHistoryLayer(t *testing.T) {
 	newLayer := toDomainHistoryLayer(&layer)
 	assert.Equal(t, layer.Size, newLayer.Size)
 }
-
-//
-// import (
-// 	"context"
-// 	"testing"
-//
-// 	"github.com/stretchr/testify/mock"
-// )
-//
-// type MockImageRuntime struct {
-// 	mock.Mock
-// }
-//
-// func (m *MockImageRuntime) Delete(ctx context.Context, renderer func() interface{}, name string) error {
-// 	_ = m.Called(ctx, renderer, name)
-// 	return nil
-// }
-//
-// func TestImageSuccess(t *testing.T) {
-// 	actual := func() interface{} { return nil }
-//
-// 	m := new(MockImageRuntime)
-// 	m.On(
-// 		"Delete",
-// 		mock.AnythingOfType("*context.emptyCtx"),
-// 		mock.AnythingOfType("func() interface {}"),
-// 		"fedora").
-// 		Return(nil)
-//
-// 	r := DirectImageRuntime{m}
-// 	err := r.Delete(context.TODO(), actual, "fedora")
-// 	if err != nil {
-// 		t.Errorf("should be nil, got: %v", err)
-// 	}
-// 	m.AssertExpectations(t)
-// }