Re-named wrap => in && unwrap => out.

1 files changed, 33 insertions, 33 deletions

diff --git a/stdlib/source/test/aedifex/cache.lux b/stdlib/source/test/aedifex/cache.lux
index 19fd23203..2a2d3d2e4 100644
--- a/stdlib/source/test/aedifex/cache.lux
+++ b/stdlib/source/test/aedifex/cache.lux
@@ -48,8 +48,8 @@
 (def: type
   (Random Type)
   ($_ random.either
-      (random\wrap //artifact/type.lux_library)
-      (random\wrap //artifact/type.jvm_library)))
+      (random\in //artifact/type.lux_library)
+      (random\in //artifact/type.jvm_library)))
 
 (def: profile
   (Random [Artifact Profile XML])
@@ -58,7 +58,7 @@
                  (do try.monad
                    [pom (//pom.write profile)
                     identity (try.of_maybe (get@ #//.identity profile))]
-                   (wrap [identity profile pom]))))
+                   (in [identity profile pom]))))
               @profile.random))
 
 (def: content
@@ -73,9 +73,9 @@
     [[identity profile pom] ..profile
      type ..type
      content ..content]
-    (wrap [{#//dependency.artifact identity
-            #//dependency.type type}
-           (set@ #//package.origin (#//repository/origin.Remote "") (//package.local pom content))])))
+    (in [{#//dependency.artifact identity
+          #//dependency.type type}
+         (set@ #//package.origin (#//repository/origin.Remote "") (//package.local pom content))])))
 
 (def: resolution
   (Random Resolution)
@@ -94,9 +94,9 @@
                                                               try.to_maybe))
                                                         ..profile)
                                         content ..content]
-                                       (wrap [dependency
-                                              (set@ #//package.origin (#//repository/origin.Remote "") (//package.local pom content))])))))]
-    (wrap (dictionary.of_list //dependency.hash (list& [main_dependency main_package] dependencies)))))
+                                       (in [dependency
+                                            (set@ #//package.origin (#//repository/origin.Remote "") (//package.local pom content))])))))]
+    (in (dictionary.of_list //dependency.hash (list& [main_dependency main_package] dependencies)))))
 
 (def: singular
   Test
@@ -107,17 +107,17 @@
      #let [fs (: (file.System Async)
                  (file.mock (\ file.default separator)))
            program (program.async (program.mock environment.empty home working_directory))]]
-    (wrap (do async.monad
-            [wrote! (/.write_one program fs dependency expected_package)
-             read! (/.read_one program fs dependency)]
-            (_.cover' [/.write_one /.read_one]
-                      (<| (try.default false)
-                          (do try.monad
-                            [_ wrote!
-                             actual_package read!]
-                            (wrap (\ //package.equivalence =
-                                     (set@ #//package.origin (#//repository/origin.Local "") expected_package)
-                                     actual_package)))))))))
+    (in (do async.monad
+          [wrote! (/.write_one program fs dependency expected_package)
+           read! (/.read_one program fs dependency)]
+          (_.cover' [/.write_one /.read_one]
+                    (<| (try.default false)
+                        (do try.monad
+                          [_ wrote!
+                           actual_package read!]
+                          (in (\ //package.equivalence =
+                                 (set@ #//package.origin (#//repository/origin.Local "") expected_package)
+                                 actual_package)))))))))
 
 (def: plural
   Test
@@ -128,19 +128,19 @@
      #let [fs (: (file.System Async)
                  (file.mock (\ file.default separator)))
            program (program.async (program.mock environment.empty home working_directory))]]
-    (wrap (do async.monad
-            [wrote! (/.write_all program fs expected)
-             read! (/.read_all program fs (dictionary.keys expected) //dependency/resolution.empty)]
-            (_.cover' [/.write_all /.read_all]
-                      (<| (try.default false)
-                          (do try.monad
-                            [_ wrote!
-                             actual read!]
-                            (wrap (\ //dependency/resolution.equivalence =
-                                     (\ dictionary.functor map
-                                        (set@ #//package.origin (#//repository/origin.Local ""))
-                                        expected)
-                                     actual)))))))))
+    (in (do async.monad
+          [wrote! (/.write_all program fs expected)
+           read! (/.read_all program fs (dictionary.keys expected) //dependency/resolution.empty)]
+          (_.cover' [/.write_all /.read_all]
+                    (<| (try.default false)
+                        (do try.monad
+                          [_ wrote!
+                           actual read!]
+                          (in (\ //dependency/resolution.equivalence =
+                                 (\ dictionary.functor map
+                                    (set@ #//package.origin (#//repository/origin.Local ""))
+                                    expected)
+                                 actual)))))))))
 
 (def: #export test
   Test