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

3 files changed, 112 insertions, 117 deletions

diff --git a/stdlib/source/test/aedifex/dependency/deployment.lux b/stdlib/source/test/aedifex/dependency/deployment.lux
index 218bbaf07..3688e56aa 100644
--- a/stdlib/source/test/aedifex/dependency/deployment.lux
+++ b/stdlib/source/test/aedifex/dependency/deployment.lux
@@ -72,8 +72,8 @@
                (atom.update (dictionary.put url input) cache)
                
                _
-               (wrap [])))]
-       (wrap (#try.Success ..good_upload))))))
+               (in [])))]
+       (in (#try.Success ..good_upload))))))
 
 (def: (verify_one expected_deployments address package cache expected_artifact actual_artifact)
   (-> Nat URL Package (Dictionary URL Binary) Artifact Artifact Bit)
@@ -141,7 +141,7 @@
            dependency (: Dependency
                          [artifact
                           artifact/type.lux_library])]]
-    (wrap [dependency artifact package])))
+    (in [dependency artifact package])))
 
 (def: #export test
   Test
@@ -156,13 +156,13 @@
                               (atom.atom (dictionary.new text.hash)))
                      http (..http cache)
                      repository (repository.async (remote.repository http #.None address))]]
-              (wrap (do async.monad
-                      [?outcome (/.one repository dependency package)
-                       cache (async.future (atom.read cache))]
-                      (_.cover' [/.one]
-                                (|> ?outcome
-                                    (try\map (verify_one 1 address package cache expected_artifact))
-                                    (try.default false))))))
+              (in (do async.monad
+                    [?outcome (/.one repository dependency package)
+                     cache (async.future (atom.read cache))]
+                    (_.cover' [/.one]
+                              (|> ?outcome
+                                  (try\map (verify_one 1 address package cache expected_artifact))
+                                  (try.default false))))))
             (do {! random.monad}
               [#let [hash (: (Hash [Dependency Artifact Package])
                              (\ hash.functor map (|>> product.right product.left product.left)
@@ -179,26 +179,26 @@
                               (atom.atom (dictionary.new text.hash)))
                      http (..http cache)
                      repository (repository.async (remote.repository http #.None address))]]
-              (wrap (do async.monad
-                      [?outcome (/.all repository resolution)
-                       cache (async.future (atom.read cache))]
-                      (_.cover' [/.all]
-                                (|> ?outcome
-                                    (try\map (function (_ actual_artifacts)
-                                               (let [expected_deployments!
-                                                     (n.= num_bundles (set.size actual_artifacts))
+              (in (do async.monad
+                    [?outcome (/.all repository resolution)
+                     cache (async.future (atom.read cache))]
+                    (_.cover' [/.all]
+                              (|> ?outcome
+                                  (try\map (function (_ actual_artifacts)
+                                             (let [expected_deployments!
+                                                   (n.= num_bundles (set.size actual_artifacts))
 
-                                                     every_deployment_was_correct!
-                                                     (list.every? (function (_ [dependency expected_artifact package])
-                                                                    (let [deployed!
-                                                                          (set.member? actual_artifacts expected_artifact)
+                                                   every_deployment_was_correct!
+                                                   (list.every? (function (_ [dependency expected_artifact package])
+                                                                  (let [deployed!
+                                                                        (set.member? actual_artifacts expected_artifact)
 
-                                                                          deployed_correctly!
-                                                                          (verify_one num_bundles address package cache expected_artifact expected_artifact)]
-                                                                      (and deployed!
-                                                                           deployed_correctly!)))
-                                                                  bundles)]
-                                                 (and expected_deployments!
-                                                      every_deployment_was_correct!))))
-                                    (try.default false))))))
+                                                                        deployed_correctly!
+                                                                        (verify_one num_bundles address package cache expected_artifact expected_artifact)]
+                                                                    (and deployed!
+                                                                         deployed_correctly!)))
+                                                                bundles)]
+                                               (and expected_deployments!
+                                                    every_deployment_was_correct!))))
+                                  (try.default false))))))
             ))))
diff --git a/stdlib/source/test/aedifex/dependency/resolution.lux b/stdlib/source/test/aedifex/dependency/resolution.lux
index ea468f851..fa0391761 100644
--- a/stdlib/source/test/aedifex/dependency/resolution.lux
+++ b/stdlib/source/test/aedifex/dependency/resolution.lux
@@ -53,10 +53,10 @@
   (do {! random.monad}
     [artifact $///artifact.random
      [_ package] $///package.random]
-    (wrap (dictionary.put {#///dependency.artifact artifact
-                           #///dependency.type ///artifact/type.lux_library}
-                          package
-                          /.empty))))
+    (in (dictionary.put {#///dependency.artifact artifact
+                         #///dependency.type ///artifact/type.lux_library}
+                        package
+                        /.empty))))
 
 (def: lux_sha-1
   Text
@@ -258,33 +258,31 @@
            bad_sha-1 (..bad_sha-1 expected_artifact expected_package dummy_package)
            bad_md5 (..bad_md5 expected_artifact expected_package dummy_package)]]
     (`` ($_ _.and
-            (wrap
-             (do async.monad
-               [actual_package (/.one (///repository.mock good [])
-                                      {#///dependency.artifact expected_artifact
-                                       #///dependency.type ///artifact/type.lux_library})]
-               (_.cover' [/.one]
-                         (case actual_package
-                           (#try.Success actual_package)
-                           (\ ///package.equivalence =
-                              (set@ #///package.origin (#///repository/origin.Remote "") expected_package)
-                              actual_package)
-                           
-                           (#try.Failure _)
-                           false))))
+            (in (do async.monad
+                  [actual_package (/.one (///repository.mock good [])
+                                         {#///dependency.artifact expected_artifact
+                                          #///dependency.type ///artifact/type.lux_library})]
+                  (_.cover' [/.one]
+                            (case actual_package
+                              (#try.Success actual_package)
+                              (\ ///package.equivalence =
+                                 (set@ #///package.origin (#///repository/origin.Remote "") expected_package)
+                                 actual_package)
+                              
+                              (#try.Failure _)
+                              false))))
             (~~ (template [<exception> <bad>]
-                  [(wrap
-                    (do async.monad
-                      [actual_package (/.one (///repository.mock <bad> [])
-                                             {#///dependency.artifact expected_artifact
-                                              #///dependency.type ///artifact/type.lux_library})]
-                      (_.cover' [<exception>]
-                                (case actual_package
-                                  (#try.Failure error)
-                                  (exception.match? <exception> error)
-
-                                  (#try.Success _)
-                                  false))))]
+                  [(in (do async.monad
+                         [actual_package (/.one (///repository.mock <bad> [])
+                                                {#///dependency.artifact expected_artifact
+                                                 #///dependency.type ///artifact/type.lux_library})]
+                         (_.cover' [<exception>]
+                                   (case actual_package
+                                     (#try.Failure error)
+                                     (exception.match? <exception> error)
+
+                                     (#try.Success _)
+                                     false))))]
 
                   [/.sha-1_does_not_match bad_sha-1]
                   [/.md5_does_not_match bad_md5]
@@ -305,39 +303,37 @@
            bad_sha-1 (..bad_sha-1 expected_artifact expected_package dummy_package)
            bad_md5 (..bad_md5 expected_artifact expected_package dummy_package)]]
     ($_ _.and
-        (wrap
-         (do async.monad
-           [#let [console ($///version.echo "")]
-            actual_package (/.any console
-                                  (list (///repository.mock bad_sha-1 [])
-                                        (///repository.mock bad_md5 [])
-                                        (///repository.mock good []))
-                                  {#///dependency.artifact expected_artifact
-                                   #///dependency.type ///artifact/type.lux_library})]
-           (_.cover' [/.any]
-                     (case actual_package
-                       (#try.Success actual_package)
-                       (\ ///package.equivalence =
-                          (set@ #///package.origin (#///repository/origin.Remote "") expected_package)
-                          actual_package)
-                       
-                       (#try.Failure _)
-                       false))))
-        (wrap
-         (do async.monad
-           [#let [console ($///version.echo "")]
-            actual_package (/.any console
-                                  (list (///repository.mock bad_sha-1 [])
-                                        (///repository.mock bad_md5 []))
-                                  {#///dependency.artifact expected_artifact
-                                   #///dependency.type ///artifact/type.lux_library})]
-           (_.cover' [/.cannot_resolve]
-                     (case actual_package
-                       (#try.Failure error)
-                       (exception.match? /.cannot_resolve error)
-
-                       (#try.Success _)
-                       false))))
+        (in (do async.monad
+              [#let [console ($///version.echo "")]
+               actual_package (/.any console
+                                     (list (///repository.mock bad_sha-1 [])
+                                           (///repository.mock bad_md5 [])
+                                           (///repository.mock good []))
+                                     {#///dependency.artifact expected_artifact
+                                      #///dependency.type ///artifact/type.lux_library})]
+              (_.cover' [/.any]
+                        (case actual_package
+                          (#try.Success actual_package)
+                          (\ ///package.equivalence =
+                             (set@ #///package.origin (#///repository/origin.Remote "") expected_package)
+                             actual_package)
+                          
+                          (#try.Failure _)
+                          false))))
+        (in (do async.monad
+              [#let [console ($///version.echo "")]
+               actual_package (/.any console
+                                     (list (///repository.mock bad_sha-1 [])
+                                           (///repository.mock bad_md5 []))
+                                     {#///dependency.artifact expected_artifact
+                                      #///dependency.type ///artifact/type.lux_library})]
+              (_.cover' [/.cannot_resolve]
+                        (case actual_package
+                          (#try.Failure error)
+                          (exception.match? /.cannot_resolve error)
+
+                          (#try.Success _)
+                          false))))
         )))
 
 (def: artifacts
@@ -351,7 +347,7 @@
                                     (predicate.unite (\ ///artifact.equivalence = dependee_artifact)
                                                      (\ ///artifact.equivalence = depender_artifact)))
                                    $///artifact.random)]
-    (wrap [dependee_artifact depender_artifact ignored_artifact])))
+    (in [dependee_artifact depender_artifact ignored_artifact])))
 
 (def: (packages [dependee_artifact depender_artifact ignored_artifact])
   (-> [Artifact Artifact Artifact]
@@ -398,8 +394,8 @@
                                   (|> ignored_pom (\ xml.codec encode) (\ utf8.codec encode))
                                   #///dependency/status.Unverified]
                                  ignored_package)]]
-    (wrap [[dependee depender ignored]
-           [dependee_package depender_package ignored_package]])))
+    (in [[dependee depender ignored]
+         [dependee_package depender_package ignored_package]])))
 
 (def: all
   Test
@@ -410,26 +406,25 @@
       [dependee_package depender_package ignored_package]]
      (..packages [dependee_artifact depender_artifact ignored_artifact])]
     ($_ _.and
-        (wrap
-         (do async.monad
-           [#let [console ($///version.echo "")]
-            [successes failures resolution] (/.all console
-                                                   (list (///repository.mock (..single dependee_artifact dependee_package) [])
-                                                         (///repository.mock (..single depender_artifact depender_package) [])
-                                                         (///repository.mock (..single ignored_artifact ignored_package) []))
-                                                   (function (_ url)
-                                                     (///repository.mock ..nope []))
-                                                   (list depender)
-                                                   /.empty)]
-           (_.cover' [/.all]
-                     (and (dictionary.key? resolution depender)
-                          (list.any? (///dependency\= depender) successes)
-                          
-                          (dictionary.key? resolution dependee)
-                          (list.any? (///dependency\= dependee) successes)
-
-                          (list.empty? failures)
-                          (not (dictionary.key? resolution ignored))))))
+        (in (do async.monad
+              [#let [console ($///version.echo "")]
+               [successes failures resolution] (/.all console
+                                                      (list (///repository.mock (..single dependee_artifact dependee_package) [])
+                                                            (///repository.mock (..single depender_artifact depender_package) [])
+                                                            (///repository.mock (..single ignored_artifact ignored_package) []))
+                                                      (function (_ url)
+                                                        (///repository.mock ..nope []))
+                                                      (list depender)
+                                                      /.empty)]
+              (_.cover' [/.all]
+                        (and (dictionary.key? resolution depender)
+                             (list.any? (///dependency\= depender) successes)
+                             
+                             (dictionary.key? resolution dependee)
+                             (list.any? (///dependency\= dependee) successes)
+
+                             (list.empty? failures)
+                             (not (dictionary.key? resolution ignored))))))
         )))
 
 (def: #export test
diff --git a/stdlib/source/test/aedifex/dependency/status.lux b/stdlib/source/test/aedifex/dependency/status.lux
index 64bb2f642..5b446d643 100644
--- a/stdlib/source/test/aedifex/dependency/status.lux
+++ b/stdlib/source/test/aedifex/dependency/status.lux
@@ -21,7 +21,7 @@
 (def: #export random
   (Random /.Status)
   ($_ random.or
-      (random\wrap [])
+      (random\in [])
       (random.or ($///hash.random ///hash.sha-1)
                  ($///hash.random ///hash.md5))
       (random.and ($///hash.random ///hash.sha-1)