Implement `resolve` in terms of the path utilities

2 files changed, 2 insertions, 18 deletions

diff --git a/lib/runtime/Context.ml b/lib/runtime/Context.ml
index 000f5d6..2189735 100644
--- a/lib/runtime/Context.ml
+++ b/lib/runtime/Context.ml
@@ -6,23 +6,7 @@ module Error = struct
       ("segment" |=| Concepts.Value.String segment)
 end
 
-let resolve { Protocols.Context.root; _ } name =
-  let open Utilities.Result in
-  let rec walk handle = function
-    | [] -> Ok (Protocols.Handle.copy handle)
-    | segment :: rest ->
-       let* directory =
-         Protocols.Directory.from handle
-         |> Option.to_result ~none:(Error.not_a_directory segment)
-       in
-       let* found = Protocols.Directory.find directory segment in
-       match found with
-       | None -> Ok None
-       | Some child ->
-          Fun.protect ~finally:(fun () -> Protocols.Handle.release child)
-            (fun () -> walk child rest)
-  in
-  String.split_on_char '/' name |> List.filter (fun segment -> segment <> "") |> walk root
+let resolve { Protocols.Context.root; _ } name = Kernel.Path.lookup root name
 
 let over ~snapshot ~root ?(cancelled = fun () -> false) () =
   { Protocols.Context.snapshot
diff --git a/lib/runtime/Context.mli b/lib/runtime/Context.mli
index 6e7ab2f..214071b 100644
--- a/lib/runtime/Context.mli
+++ b/lib/runtime/Context.mli
@@ -1,6 +1,6 @@
 val resolve :
   Protocols.Context.t ->
-  string ->
+  Kernel.Path.t ->
   (Protocols.Handle.t option, Concepts.Condition.condition) result
 
 val over :