veyron2/verror: Remove verror.E
It turns out this is really simple; m3b did all the hard work
already. Eventually we'll rename verror.Standard back to
verror.E, or will pull the verror.Standard struct into a separate
package. While those details are being worked out, we want to
make sure nobody actually uses the interface in new code.
Change-Id: Ief6a0492e6aed81042a6aa982127269b2008d7e2
diff --git a/runtimes/google/ipc/client.go b/runtimes/google/ipc/client.go
index 7945478..b095780 100644
--- a/runtimes/google/ipc/client.go
+++ b/runtimes/google/ipc/client.go
@@ -828,7 +828,7 @@
defer vlog.LogCall()()
switch {
case fc.response.Error != nil:
- // TODO(cnicolaou): this will become a verror.E when we convert the
+ // TODO(cnicolaou): this will become a verror.Standard when we convert the
// server.
return verror.New(verror.BadProtocol, fc.ctx, fc.response.Error)
case fc.response.EndStreamResults:
@@ -841,7 +841,7 @@
return fc.close(berr)
}
if fc.response.Error != nil {
- // TODO(cnicolaou): this will become a verror.E when we convert the
+ // TODO(cnicolaou): this will become a verror.Standard when we convert the
// server.
return verror.New(verror.BadProtocol, fc.ctx, fc.response.Error)
}
diff --git a/runtimes/google/ipc/testutil_test.go b/runtimes/google/ipc/testutil_test.go
index a4c6818..280b33f 100644
--- a/runtimes/google/ipc/testutil_test.go
+++ b/runtimes/google/ipc/testutil_test.go
@@ -13,13 +13,9 @@
for ix, in := range ins {
typ := reflect.TypeOf(in)
if typ == nil {
- // nil interfaces can only imply an error.
- // This is in sync with result2vom in server.go. The
- // reasons for this check and conditions for when it
- // can be removed can be seen in the comments for
- // result2vom.
- var verr verror.E
- typ = reflect.ValueOf(&verr).Elem().Type()
+ // Nil indicates interface{}.
+ var empty interface{}
+ typ = reflect.ValueOf(&empty).Elem().Type()
}
outs[ix] = reflect.New(typ).Interface()
}
