TBR: services/syncbase/server: Fix mojo compilation by switching rpc.Server
to rpc.XServer.
Change-Id: I3406289640779be51e778debe69d9a0438f536be
diff --git a/services/syncbase/server/mojo_call.go b/services/syncbase/server/mojo_call.go
index d0b9dac..c825bc0 100644
--- a/services/syncbase/server/mojo_call.go
+++ b/services/syncbase/server/mojo_call.go
@@ -16,12 +16,12 @@
type mojoServerCall struct {
sec security.Call
- srv rpc.Server
+ srv rpc.XServer
suffix string
}
// TODO(sadovsky): Synthesize endpoints and discharges as needed.
-func newMojoServerCall(ctx *context.T, srv rpc.Server, suffix string, method rpc.MethodDesc) rpc.ServerCall {
+func newMojoServerCall(ctx *context.T, srv rpc.XServer, suffix string, method rpc.MethodDesc) rpc.ServerCall {
p := v23.GetPrincipal(ctx)
// HACK: For now, we set the remote (client, i.e. Mojo app) blessing to be the
// same as the local (server, i.e. Syncbase Mojo service) blessing.
@@ -63,6 +63,6 @@
return security.Blessings{}
}
-func (call *mojoServerCall) Server() rpc.Server {
+func (call *mojoServerCall) Server() rpc.XServer {
return call.srv
}
diff --git a/services/syncbase/server/mojo_impl.go b/services/syncbase/server/mojo_impl.go
index 603f954..27bd987 100644
--- a/services/syncbase/server/mojo_impl.go
+++ b/services/syncbase/server/mojo_impl.go
@@ -33,11 +33,11 @@
type mojoImpl struct {
ctx *context.T
- srv rpc.Server
+ srv rpc.XServer
disp rpc.Dispatcher
}
-func NewMojoImpl(ctx *context.T, srv rpc.Server, disp rpc.Dispatcher) *mojoImpl {
+func NewMojoImpl(ctx *context.T, srv rpc.XServer, disp rpc.Dispatcher) *mojoImpl {
return &mojoImpl{ctx: ctx, srv: srv, disp: disp}
}