internal/naming/namespace: deflake some tests, cleanup some comments.
Change-Id: Idf0d393208cf426cbc0ff5f2ba6af225b3f26737
diff --git a/profiles/internal/rpc/client.go b/profiles/internal/rpc/client.go
index f00c4ba..8fbab8f 100644
--- a/profiles/internal/rpc/client.go
+++ b/profiles/internal/rpc/client.go
@@ -566,7 +566,7 @@
go func() {
select {
case <-doneChan:
- vtrace.GetSpan(fc.ctx).Annotate("Cancelled")
+ vtrace.GetSpan(fc.ctx).Annotate("Canceled")
fc.flow.Cancel()
case <-fc.flow.Closed():
}
@@ -899,8 +899,6 @@
defer vlog.LogCall()()
switch {
case fc.response.Error != nil:
- // TODO(cnicolaou): this will become a verror.E when we convert the
- // server.
return verror.New(verror.ErrBadProtocol, fc.ctx, fc.response.Error)
case fc.response.EndStreamResults:
return io.EOF
@@ -913,8 +911,6 @@
return fc.close(berr)
}
if fc.response.Error != nil {
- // TODO(cnicolaou): this will become a verror.E when we convert the
- // server.
return verror.New(verror.ErrBadProtocol, fc.ctx, fc.response.Error)
}
if fc.response.EndStreamResults {