x/ref: Remove verror.Is and verror.Equal
It's simpler to just use verror.ErrorID instead
MultiPart: 2/2
Change-Id: I12886abe7e7d6345186022b9127d45c6fff54ec6
diff --git a/services/wsprd/app/app_test.go b/services/wsprd/app/app_test.go
index 974d061..8c75b0a 100644
--- a/services/wsprd/app/app_test.go
+++ b/services/wsprd/app/app_test.go
@@ -450,11 +450,7 @@
var result *vdl.Value
err = call.Finish(&result)
- // If err is nil and testCase.err is nil reflect.DeepEqual will return
- // false because the types are different. Because of this, we only use
- // reflect.DeepEqual if one of the values is non-nil. If both values
- // are nil, then we consider them equal.
- if (err != nil || testCase.err != nil) && !verror.Equal(err, testCase.err) {
+ if verror.ErrorID(err) != verror.ErrorID(testCase.err) {
t.Errorf("unexpected err: got %#v, expected %#v", err, testCase.err)
}
diff --git a/services/wsprd/app/messaging.go b/services/wsprd/app/messaging.go
index 5ea5a40..22a092e 100644
--- a/services/wsprd/app/messaging.go
+++ b/services/wsprd/app/messaging.go
@@ -179,7 +179,7 @@
if _, file, line, ok := runtime.Caller(3); ok {
logErr = fmt.Sprintf("%s:%d: %s", filepath.Base(file), line, logErr)
}
- if verror.Is(verr, verror.ErrInternal.ID) {
+ if verror.ErrorID(verr) == verror.ErrInternal.ID {
logLevel = 2
}
vlog.VI(logLevel).Info(logErr)
diff --git a/services/wsprd/lib/testwriter/writer.go b/services/wsprd/lib/testwriter/writer.go
index 6aec6dc..65dabb9 100644
--- a/services/wsprd/lib/testwriter/writer.go
+++ b/services/wsprd/lib/testwriter/writer.go
@@ -105,7 +105,7 @@
if got, want := w.Stream, wantStream; !reflect.DeepEqual(got, want) {
return fmt.Errorf("streams don't match: got %#v, want %#v", got, want)
}
- if got, want := w.err, wantErr; !verror.Equal(got, want) {
+ if got, want := w.err, wantErr; verror.ErrorID(got) != verror.ErrorID(want) {
return fmt.Errorf("unexpected error, got: %#v, expected: %#v", got, want)
}
return nil
diff --git a/services/wsprd/principal/util_test.go b/services/wsprd/principal/util_test.go
index 80bf068..7ee21ed 100644
--- a/services/wsprd/principal/util_test.go
+++ b/services/wsprd/principal/util_test.go
@@ -40,7 +40,7 @@
if got == nil {
return fmt.Errorf("Got nil error, wanted to match %q", want)
}
- if !verror.Is(got, want) {
+ if verror.ErrorID(got) != want {
return fmt.Errorf("Got error %q, wanted to match %q", got, want)
}
return nil
diff --git a/services/wsprd/wspr/writer.go b/services/wsprd/wspr/writer.go
index 3fe0917..956c6bb 100644
--- a/services/wsprd/wspr/writer.go
+++ b/services/wsprd/wspr/writer.go
@@ -64,7 +64,7 @@
if _, file, line, ok := runtime.Caller(3); ok {
logErr = fmt.Sprintf("%s:%d: %s", filepath.Base(file), line, logErr)
}
- if verror.Is(verr, verror.ErrInternal.ID) {
+ if verror.ErrorID(verr) == verror.ErrInternal.ID {
logLevel = 2
}
vlog.VI(logLevel).Info(logErr)
