From 5593352226fde9f3f8a98f2f419b67116e246846 Mon Sep 17 00:00:00 2001
From: ryanfkeepers <ryanfkeepers@gmail.com>
Date: Mon, 20 Feb 2023 15:28:23 -0700
Subject: [PATCH] fix unit tests

---
 src/pkg/backup/backup.go      |  8 ++++----
 src/pkg/backup/backup_test.go |  2 +-
 src/pkg/fault/fault.go        | 10 +++-------
 src/pkg/fault/fault_test.go   | 22 +++++++++-------------
 4 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/src/pkg/backup/backup.go b/src/pkg/backup/backup.go
index e5021a402..2f0c09671 100644
--- a/src/pkg/backup/backup.go
+++ b/src/pkg/backup/backup.go
@@ -69,7 +69,7 @@ func New(
 		DetailsID:       detailsID,
 		Status:          status,
 		Selector:        selector,
-		Errors:          errs.Data(),
+		Errors:          errs.Errors(),
 		ReadWrites:      rw,
 		StartAndEndTime: se,
 		Version:         Version,
@@ -156,12 +156,12 @@ func (b Backup) errorCount() int {
 	}
 
 	// future tracking
-	if b.Errors.Err != nil || len(b.Errors.Errs) > 0 {
-		if b.Errors.Err != nil {
+	if b.Errors.Failure != nil || len(b.Errors.Recovered) > 0 {
+		if b.Errors.Failure != nil {
 			errCount++
 		}
 
-		errCount += len(b.Errors.Errs)
+		errCount += len(b.Errors.Recovered)
 	}
 
 	return errCount
diff --git a/src/pkg/backup/backup_test.go b/src/pkg/backup/backup_test.go
index a9713088f..1d7f1937b 100644
--- a/src/pkg/backup/backup_test.go
+++ b/src/pkg/backup/backup_test.go
@@ -42,7 +42,7 @@ func stubBackup(t time.Time) backup.Backup {
 		Status:       "status",
 		Selector:     sel.Selector,
 		Errors: fault.Errors{
-			Errs: []error{errors.New("read"), errors.New("write")},
+			Recovered: []error{errors.New("read"), errors.New("write")},
 		},
 		Errs: stats.Errs{
 			ReadErrors:  errors.New("1"),
diff --git a/src/pkg/fault/fault.go b/src/pkg/fault/fault.go
index e99557a0c..a7c61c8bd 100644
--- a/src/pkg/fault/fault.go
+++ b/src/pkg/fault/fault.go
@@ -32,12 +32,8 @@ type Bus struct {
 // controls, allowing the data to be persisted.
 type Errors struct {
 	Failure   error   `json:"failure"`
-	Recovered []error `json:"recovered"`
+	Recovered []error `json:"-"`
 	FailFast  bool    `json:"failFast"`
-
-	// legacy support
-	Err  error   `json:"err"`
-	Errs []error `json:"errs"`
 }
 
 // New constructs a new error with default values in place.
@@ -63,9 +59,9 @@ func (e *Bus) Recovered() []error {
 	return e.recoverable
 }
 
-// Data returns the plain record of errors that were aggregated
+// Errors returns the plain record of errors that were aggregated
 // within a fult Bus.
-func (e *Bus) Data() Errors {
+func (e *Bus) Errors() Errors {
 	return Errors{
 		Failure:   e.failure,
 		Recovered: slices.Clone(e.recoverable),
diff --git a/src/pkg/fault/fault_test.go b/src/pkg/fault/fault_test.go
index f204b5c4e..c7d14a957 100644
--- a/src/pkg/fault/fault_test.go
+++ b/src/pkg/fault/fault_test.go
@@ -177,7 +177,7 @@ func (suite *FaultErrorsUnitSuite) TestAdd() {
 	assert.Len(t, n.Recovered(), 2)
 }
 
-func (suite *FaultErrorsUnitSuite) TestData() {
+func (suite *FaultErrorsUnitSuite) TestErrors() {
 	t := suite.T()
 
 	// not fail-fast
@@ -188,9 +188,9 @@ func (suite *FaultErrorsUnitSuite) TestData() {
 	n.AddRecoverable(errors.New("1"))
 	n.AddRecoverable(errors.New("2"))
 
-	d := n.Data()
-	assert.Equal(t, n.Failure(), d.Err)
-	assert.ElementsMatch(t, n.Recovered(), d.Errs)
+	d := n.Errors()
+	assert.Equal(t, n.Failure(), d.Failure)
+	assert.ElementsMatch(t, n.Recovered(), d.Recovered)
 	assert.False(t, d.FailFast)
 
 	// fail-fast
@@ -201,9 +201,9 @@ func (suite *FaultErrorsUnitSuite) TestData() {
 	n.AddRecoverable(errors.New("1"))
 	n.AddRecoverable(errors.New("2"))
 
-	d = n.Data()
-	assert.Equal(t, n.Failure(), d.Err)
-	assert.ElementsMatch(t, n.Recovered(), d.Errs)
+	d = n.Errors()
+	assert.Equal(t, n.Failure(), d.Failure)
+	assert.ElementsMatch(t, n.Recovered(), d.Recovered)
 	assert.True(t, d.FailFast)
 }
 
@@ -217,14 +217,10 @@ func (suite *FaultErrorsUnitSuite) TestMarshalUnmarshal() {
 	n.AddRecoverable(errors.New("1"))
 	n.AddRecoverable(errors.New("2"))
 
-	data := n.Data()
-
-	jsonStr, err := json.Marshal(data)
+	bs, err := json.Marshal(n.Errors())
 	require.NoError(t, err)
 
-	um := fault.Errors{}
-
-	err = json.Unmarshal(jsonStr, &um)
+	err = json.Unmarshal(bs, &fault.Errors{})
 	require.NoError(t, err)
 }