services/mounttable: Remove ResolveStepX
MultiPart: 2/2
Change-Id: I37a0fb42b4f198b91aad5d43561eae2718d9d0c1
diff --git a/cmd/mounttable/impl_test.go b/cmd/mounttable/impl_test.go
index 40f66cb..84de715 100644
--- a/cmd/mounttable/impl_test.go
+++ b/cmd/mounttable/impl_test.go
@@ -65,13 +65,6 @@
return
}
-func (s *server) ResolveStepX(*context.T, rpc.ServerCall) (entry naming.MountEntry, err error) {
- vlog.VI(2).Infof("ResolveStepX() was called. suffix=%v", s.suffix)
- entry.Servers = []naming.MountedServer{{"server1", deadline(1)}}
- entry.Name = s.suffix
- return
-}
-
func (s *server) Delete(*context.T, rpc.ServerCall, bool) error {
vlog.VI(2).Infof("Delete() was called. suffix=%v", s.suffix)
return nil
diff --git a/services/mounttable/mounttablelib/mounttable.go b/services/mounttable/mounttablelib/mounttable.go
index ca9f9f1..f3359ca 100644
--- a/services/mounttable/mounttablelib/mounttable.go
+++ b/services/mounttable/mounttablelib/mounttable.go
@@ -429,12 +429,6 @@
return nil
}
-// ResolveStep returns the next server in a resolution, the name remaining below that server,
-// and whether or not that server is another mount table.
-func (ms *mountContext) ResolveStepX(ctx *context.T, call rpc.ServerCall) (entry naming.MountEntry, err error) {
- return ms.ResolveStep(ctx, call)
-}
-
// ResolveStep returns the next server in a resolution in the form of a MountEntry. The name
// in the mount entry is the name relative to the server's root.
func (ms *mountContext) ResolveStep(ctx *context.T, call rpc.ServerCall) (entry naming.MountEntry, err error) {
diff --git a/services/mounttable/mounttablelib/neighborhood.go b/services/mounttable/mounttablelib/neighborhood.go
index 8b7f1fd..bfbb37d 100644
--- a/services/mounttable/mounttablelib/neighborhood.go
+++ b/services/mounttable/mounttablelib/neighborhood.go
@@ -210,11 +210,6 @@
return neighbors
}
-// ResolveStepX implements ResolveStepX
-func (ns *neighborhoodService) ResolveStepX(ctx *context.T, call rpc.ServerCall) (entry naming.MountEntry, err error) {
- return ns.ResolveStep(ctx, call)
-}
-
// ResolveStep implements ResolveStep
func (ns *neighborhoodService) ResolveStep(ctx *context.T, _ rpc.ServerCall) (entry naming.MountEntry, err error) {
nh := ns.nh
