From d0e4ba8124345ce990de7fdf7497dd903de6c342 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Tue, 30 Aug 2022 19:33:36 -0400
Subject: Got rid of the superfluous "lux macro" extension.

---
 .../source/test/aedifex/dependency/resolution.lux  | 52 +++++++++++-----------
 1 file changed, 26 insertions(+), 26 deletions(-)

(limited to 'stdlib/source/test/aedifex/dependency/resolution.lux')

diff --git a/stdlib/source/test/aedifex/dependency/resolution.lux b/stdlib/source/test/aedifex/dependency/resolution.lux
index ad9d9033f..c6c14fec4 100644
--- a/stdlib/source/test/aedifex/dependency/resolution.lux
+++ b/stdlib/source/test/aedifex/dependency/resolution.lux
@@ -61,26 +61,26 @@
                         package
                         /.empty))))
 
-(def lux_sha-1
+(def lux_sha1
   Text
-  (format ///artifact/extension.lux_library ///artifact/extension.sha-1))
+  (format ///artifact/extension.lux_library ///artifact/extension.sha1))
 
 (def lux_md5
   Text
   (format ///artifact/extension.lux_library ///artifact/extension.md5))
 
-(def pom_sha-1
+(def pom_sha1
   Text
-  (format ///artifact/extension.pom ///artifact/extension.sha-1))
+  (format ///artifact/extension.pom ///artifact/extension.sha1))
 
 (def pom_md5
   Text
   (format ///artifact/extension.pom ///artifact/extension.md5))
 
-(def sha-1
+(def sha1
   (-> Binary Binary)
-  (|>> ///hash.sha-1
-       (at ///hash.sha-1_codec encoded)
+  (|>> ///hash.sha1
+       (at ///hash.sha1_codec encoded)
        (at utf8.codec encoded)))
 
 (def md5
@@ -120,8 +120,8 @@
            (cond (text.ends_with? ///artifact/extension.lux_library uri)
                  {try.#Success [state library]}
 
-                 (text.ends_with? ..lux_sha-1 uri)
-                 {try.#Success [state (..sha-1 library)]}
+                 (text.ends_with? ..lux_sha1 uri)
+                 {try.#Success [state (..sha1 library)]}
 
                  (text.ends_with? ..lux_md5 uri)
                  {try.#Success [state (..md5 library)]}
@@ -129,8 +129,8 @@
                  (text.ends_with? ///artifact/extension.pom uri)
                  {try.#Success [state pom]}
 
-                 (text.ends_with? ..pom_sha-1 uri)
-                 {try.#Success [state (..sha-1 pom)]}
+                 (text.ends_with? ..pom_sha1 uri)
+                 {try.#Success [state (..sha1 pom)]}
 
                  (text.ends_with? ..pom_md5 uri)
                  {try.#Success [state (..md5 pom)]}
@@ -141,11 +141,11 @@
      (def (on_upload uri binary state)
        {try.#Failure "NOPE"}))))
 
-(def (bad_sha-1 expected_artifact expected_package dummy_package)
+(def (bad_sha1 expected_artifact expected_package dummy_package)
   (-> Artifact Package Package (Mock Any))
   (implementation
    (def the_description
-     "[~SHA-1]")
+     "[~SHA1]")
    (def (on_download uri state)
      (if (text.contains? (///artifact.uri (the ///artifact.#version expected_artifact) expected_artifact) uri)
        (cond (text.ends_with? ///artifact/extension.lux_library uri)
@@ -153,11 +153,11 @@
                                       (the ///package.#library)
                                       product.left)]}
 
-             (text.ends_with? ..lux_sha-1 uri)
+             (text.ends_with? ..lux_sha1 uri)
              {try.#Success [state (|> expected_package
                                       (the ///package.#library)
                                       product.left
-                                      ..sha-1)]}
+                                      ..sha1)]}
 
              (text.ends_with? ..lux_md5 uri)
              {try.#Success [state (|> expected_package
@@ -172,13 +172,13 @@
                                       (at xml.codec encoded)
                                       (at utf8.codec encoded))]}
 
-             (text.ends_with? ..pom_sha-1 uri)
+             (text.ends_with? ..pom_sha1 uri)
              {try.#Success [state (|> dummy_package
                                       (the ///package.#pom)
                                       product.left
                                       (at xml.codec encoded)
                                       (at utf8.codec encoded)
-                                      ..sha-1)]}
+                                      ..sha1)]}
 
              (text.ends_with? ..pom_md5 uri)
              {try.#Success [state (|> expected_package
@@ -206,11 +206,11 @@
                                       (the ///package.#library)
                                       product.left)]}
 
-             (text.ends_with? ..lux_sha-1 uri)
+             (text.ends_with? ..lux_sha1 uri)
              {try.#Success [state (|> expected_package
                                       (the ///package.#library)
                                       product.left
-                                      ..sha-1)]}
+                                      ..sha1)]}
 
              (text.ends_with? ..lux_md5 uri)
              {try.#Success [state (|> dummy_package
@@ -225,13 +225,13 @@
                                       (at xml.codec encoded)
                                       (at utf8.codec encoded))]}
 
-             (text.ends_with? ..pom_sha-1 uri)
+             (text.ends_with? ..pom_sha1 uri)
              {try.#Success [state (|> expected_package
                                       (the ///package.#pom)
                                       product.left
                                       (at xml.codec encoded)
                                       (at utf8.codec encoded)
-                                      ..sha-1)]}
+                                      ..sha1)]}
 
              (text.ends_with? ..pom_md5 uri)
              {try.#Success [state (|> dummy_package
@@ -258,7 +258,7 @@
                                          not)
                                     $///package.random)
      .let [good (..single expected_artifact expected_package)
-           bad_sha-1 (..bad_sha-1 expected_artifact expected_package dummy_package)
+           bad_sha1 (..bad_sha1 expected_artifact expected_package dummy_package)
            bad_md5 (..bad_md5 expected_artifact expected_package dummy_package)]]
     (`` (.all _.and
               (in (do async.monad
@@ -287,7 +287,7 @@
                                {try.#Success _}
                                false))))]
 
-                    [/.sha-1_does_not_match bad_sha-1]
+                    [/.sha1_does_not_match bad_sha1]
                     [/.md5_does_not_match bad_md5]
                     ))
               ))))
@@ -303,13 +303,13 @@
                                          not)
                                     $///package.random)
      .let [good (..single expected_artifact expected_package)
-           bad_sha-1 (..bad_sha-1 expected_artifact expected_package dummy_package)
+           bad_sha1 (..bad_sha1 expected_artifact expected_package dummy_package)
            bad_md5 (..bad_md5 expected_artifact expected_package dummy_package)]]
     (.all _.and
           (in (do async.monad
                 [.let [console ($///version.echo "")]
                  actual_package (/.any console
-                                       (list (///repository.mock bad_sha-1 [])
+                                       (list (///repository.mock bad_sha1 [])
                                              (///repository.mock bad_md5 [])
                                              (///repository.mock good []))
                                        [///dependency.#artifact expected_artifact
@@ -326,7 +326,7 @@
           (in (do async.monad
                 [.let [console ($///version.echo "")]
                  actual_package (/.any console
-                                       (list (///repository.mock bad_sha-1 [])
+                                       (list (///repository.mock bad_sha1 [])
                                              (///repository.mock bad_md5 []))
                                        [///dependency.#artifact expected_artifact
                                         ///dependency.#type ///artifact/type.lux_library])]
-- 
cgit v1.2.3