From a82bd1eabe94763162c2b0707d9c198fbe9835e3 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Fri, 18 Jun 2021 14:21:41 -0400
Subject: Refactored the machinery to make local macros into its own module.

---
 stdlib/source/test/aedifex/command/deploy.lux | 36 ++++++++++++++++++---------
 1 file changed, 24 insertions(+), 12 deletions(-)

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

diff --git a/stdlib/source/test/aedifex/command/deploy.lux b/stdlib/source/test/aedifex/command/deploy.lux
index 617b3386a..cc99f2e48 100644
--- a/stdlib/source/test/aedifex/command/deploy.lux
+++ b/stdlib/source/test/aedifex/command/deploy.lux
@@ -17,7 +17,8 @@
     ["." binary]
     ["." text ("#\." equivalence)
      ["%" format (#+ format)]
-     ["." encoding]]
+     [encoding
+      ["." utf8]]]
     ["." format #_
      ["#" binary]
      ["." tar]
@@ -108,31 +109,42 @@
                                                  (export.library fs)
                                                  (\ ! map (format.run tar.writer)))
 
-                            actual_pom (\ repository download (///repository/remote.uri artifact ///artifact/extension.pom))
-                            actual_library (\ repository download (///repository/remote.uri artifact ///artifact/extension.lux_library))
-                            actual_sha-1 (\ repository download (///repository/remote.uri artifact (format ///artifact/extension.lux_library ///artifact/extension.sha-1)))
-                            actual_md5 (\ repository download (///repository/remote.uri artifact (format ///artifact/extension.lux_library ///artifact/extension.md5)))
+                            actual_pom (\ repository download (///repository/remote.uri (get@ #///artifact.version artifact) artifact ///artifact/extension.pom))
+                            actual_library (\ repository download (///repository/remote.uri (get@ #///artifact.version artifact) artifact ///artifact/extension.lux_library))
+                            actual_sha-1 (\ repository download (///repository/remote.uri (get@ #///artifact.version artifact) artifact (format ///artifact/extension.lux_library ///artifact/extension.sha-1)))
+                            actual_sha-1 (\ promise.monad wrap
+                                            (do try.monad
+                                              [actual_sha-1 (\ utf8.codec decode actual_sha-1)]
+                                              (\ ///hash.sha-1_codec decode actual_sha-1)))
+                            actual_md5 (\ repository download (///repository/remote.uri (get@ #///artifact.version artifact) artifact (format ///artifact/extension.lux_library ///artifact/extension.md5)))
+                            actual_md5 (\ promise.monad wrap
+                                          (do try.monad
+                                            [actual_md5 (\ utf8.codec decode actual_md5)]
+                                            (\ ///hash.md5_codec decode actual_md5)))
 
-                            #let [deployed_library!
+                            #let [succeeded!
+                                  (text\= //clean.success logging)
+
+                                  deployed_library!
                                   (\ binary.equivalence =
                                      expected_library
                                      actual_library)
 
                                   deployed_pom!
                                   (\ binary.equivalence =
-                                     (|> expected_pom (\ xml.codec encode) (\ encoding.utf8 encode))
+                                     (|> expected_pom (\ xml.codec encode) (\ utf8.codec encode))
                                      actual_pom)
 
                                   deployed_sha-1!
-                                  (\ binary.equivalence =
-                                     (///hash.data (///hash.sha-1 expected_library))
+                                  (\ ///hash.equivalence =
+                                     (///hash.sha-1 expected_library)
                                      actual_sha-1)
 
                                   deployed_md5!
-                                  (\ binary.equivalence =
-                                     (///hash.data (///hash.md5 expected_library))
+                                  (\ ///hash.equivalence =
+                                     (///hash.md5 expected_library)
                                      actual_md5)]]
-                           (wrap (and (text\= //clean.success logging)
+                           (wrap (and succeeded!
                                       deployed_library!
                                       deployed_pom!
                                       deployed_sha-1!
-- 
cgit v1.2.3