From 249528d206c4a7d25cb1db4a2df830af6ca3d938 Mon Sep 17 00:00:00 2001
From: shabbyrobe <code@shabbyrobe.org>
Date: Sun, 17 Feb 2019 23:48:59 +1100
Subject: [PATCH] Rename DeleteResult to MultiDeleteResult for clarity

---
 backend.go                | 2 +-
 backend/s3afero/multi.go  | 2 +-
 backend/s3afero/single.go | 2 +-
 backend/s3bolt/backend.go | 2 +-
 backend/s3mem/backend.go  | 2 +-
 messages.go               | 9 +++++----
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/backend.go b/backend.go
index 197cd2d..4754574 100644
--- a/backend.go
+++ b/backend.go
@@ -126,7 +126,7 @@ type Backend interface {
 	// gofakes3.ReadAll() for this job rather than ioutil.ReadAll().
 	PutObject(bucketName, key string, meta map[string]string, input io.Reader, size int64) error
 
-	DeleteMulti(bucketName string, objects ...string) (DeleteResult, error)
+	DeleteMulti(bucketName string, objects ...string) (MultiDeleteResult, error)
 }
 
 // VersionedBackend may be optionally implemented by a Backend in order to support
diff --git a/backend/s3afero/multi.go b/backend/s3afero/multi.go
index 6c3667e..5b6cad5 100644
--- a/backend/s3afero/multi.go
+++ b/backend/s3afero/multi.go
@@ -456,7 +456,7 @@ func (db *MultiBucketBackend) deleteObjectLocked(bucketName, objectName string)
 	return nil
 }
 
-func (db *MultiBucketBackend) DeleteMulti(bucketName string, objects ...string) (result gofakes3.DeleteResult, rerr error) {
+func (db *MultiBucketBackend) DeleteMulti(bucketName string, objects ...string) (result gofakes3.MultiDeleteResult, rerr error) {
 	db.lock.Lock()
 	defer db.lock.Unlock()
 
diff --git a/backend/s3afero/single.go b/backend/s3afero/single.go
index addb57a..0eb2464 100644
--- a/backend/s3afero/single.go
+++ b/backend/s3afero/single.go
@@ -332,7 +332,7 @@ func (db *SingleBucketBackend) PutObject(bucketName, objectName string, meta map
 	return nil
 }
 
-func (db *SingleBucketBackend) DeleteMulti(bucketName string, objects ...string) (result gofakes3.DeleteResult, rerr error) {
+func (db *SingleBucketBackend) DeleteMulti(bucketName string, objects ...string) (result gofakes3.MultiDeleteResult, rerr error) {
 	if bucketName != db.name {
 		return result, gofakes3.BucketNotFound(bucketName)
 	}
diff --git a/backend/s3bolt/backend.go b/backend/s3bolt/backend.go
index 7f888ae..7b825b2 100644
--- a/backend/s3bolt/backend.go
+++ b/backend/s3bolt/backend.go
@@ -322,7 +322,7 @@ func (db *Backend) DeleteObject(bucketName, objectName string) (result gofakes3.
 	})
 }
 
-func (db *Backend) DeleteMulti(bucketName string, objects ...string) (result gofakes3.DeleteResult, err error) {
+func (db *Backend) DeleteMulti(bucketName string, objects ...string) (result gofakes3.MultiDeleteResult, err error) {
 	err = db.bolt.Update(func(tx *bolt.Tx) error {
 		b := tx.Bucket([]byte(bucketName))
 		if b == nil {
diff --git a/backend/s3mem/backend.go b/backend/s3mem/backend.go
index 6bacfe9..a3bd8c5 100644
--- a/backend/s3mem/backend.go
+++ b/backend/s3mem/backend.go
@@ -222,7 +222,7 @@ func (db *Backend) DeleteObject(bucketName, objectName string) (result gofakes3.
 	return result, nil
 }
 
-func (db *Backend) DeleteMulti(bucketName string, objects ...string) (result gofakes3.DeleteResult, err error) {
+func (db *Backend) DeleteMulti(bucketName string, objects ...string) (result gofakes3.MultiDeleteResult, err error) {
 	db.lock.Lock()
 	defer db.lock.Unlock()
 
diff --git a/messages.go b/messages.go
index 2bc6482..efbbfa5 100644
--- a/messages.go
+++ b/messages.go
@@ -115,13 +115,14 @@ type DeleteRequest struct {
 	Quiet bool `xml:"Quiet"`
 }
 
-// DeleteResult contains the response from a multi delete operation.
-type DeleteResult struct {
+// MultiDeleteResult contains the response from a multi delete operation.
+type MultiDeleteResult struct {
+	XMLName xml.Name      `xml:"DeleteResult"`
 	Deleted []ObjectID    `xml:"Deleted"`
 	Error   []ErrorResult `xml:",omitempty"`
 }
 
-func (d DeleteResult) AsError() error {
+func (d MultiDeleteResult) AsError() error {
 	if len(d.Error) == 0 {
 		return nil
 	}
@@ -129,7 +130,7 @@ func (d DeleteResult) AsError() error {
 	for _, er := range d.Error {
 		strs = append(strs, er.String())
 	}
-	return fmt.Errorf("delete failed:\n%s", strings.Join(strs, "\n"))
+	return fmt.Errorf("gofakes3: multi delete failed:\n%s", strings.Join(strs, "\n"))
 }
 
 type ErrorResult struct {