From 2b909032e7a0bd10cd7db52067d2fb701bfa95e5 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Tue, 6 Jul 2021 21:34:21 -0400
Subject: Simplified the API for file-system operations.

---
 stdlib/source/test/aedifex/command/clean.lux | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'stdlib/source/test/aedifex/command/clean.lux')

diff --git a/stdlib/source/test/aedifex/command/clean.lux b/stdlib/source/test/aedifex/command/clean.lux
index 18997e02e..e23e99b96 100644
--- a/stdlib/source/test/aedifex/command/clean.lux
+++ b/stdlib/source/test/aedifex/command/clean.lux
@@ -20,7 +20,7 @@
     [number
      ["n" nat]]]
    [world
-    ["." file (#+ Path File)]]]
+    ["." file (#+ Path)]]]
   [//
    ["@." version]
    [//
@@ -28,7 +28,7 @@
     [//
      [lux
       [data
-       ["_." binary]]]]]]
+       ["$." binary]]]]]]
   {#program
    ["." /
     ["//#" /// #_
@@ -44,32 +44,29 @@
   (do {! random.monad}
     [count (\ ! map (n.% 10) random.nat)
      names (random.set text.hash count ..node_name)
-     contents (random.list count (_binary.random 100))]
+     contents (random.list count ($binary.random 100))]
     (wrap (list.zip/2 (list\map (|>> (format prefix)) (set.to_list names))
                       contents))))
 
 (def: (create_file! fs [path content])
   (-> (file.System Promise) [Path Binary] (Promise (Try Any)))
-  (do {! (try.with promise.monad)}
-    [file (: (Promise (Try (File Promise)))
-             (file.get_file promise.monad fs path))]
-    (\ file over_write content)))
+  (\ fs write content path))
 
 (def: (create_directory! fs path files)
   (-> (file.System Promise) Path (List [Path Binary]) (Promise (Try Any)))
   (do {! (try.with promise.monad)}
-    [_ (: (Promise (Try Path))
+    [_ (: (Promise (Try Any))
           (file.make_directories promise.monad fs path))
      _ (monad.map ! (..create_file! fs) files)]
     (wrap [])))
 
 (def: (directory_exists? fs)
   (-> (file.System Promise) Path (Promise (Try Bit)))
-  (|>> (file.directory_exists? promise.monad fs) (try.lift promise.monad)))
+  (|>> (\ fs directory?) (try.lift promise.monad)))
 
 (def: (file_exists? fs)
   (-> (file.System Promise) Path (Promise (Try Bit)))
-  (|>> (file.file_exists? promise.monad fs) (try.lift promise.monad)))
+  (|>> (\ fs file?) (try.lift promise.monad)))
 
 (def: (assets_exist? fs directory_path files)
   (-> (file.System Promise) Path (List [Path Binary]) (Promise (Try Bit)))
-- 
cgit v1.2.3