Remove some wrapping logic from -bind impl.

Now is fully compliant.
funcool · Mar 17, 2016 · 6580de1 · 6580de1
1 parent a97ae98
commit 6580de1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/src/promesa/core.cljc b/src/promesa/core.cljc
@@ -190,6 +190,7 @@
      (-pending? [it]
        (.isPending it))))
 
+
 #?(:clj
    (extend-type CompletionStage
      ICancellable
@@ -202,19 +203,13 @@
      (-map [it cb]
        (.thenApplyAsync it (reify Function
                              (apply [_ v]
-                               (let [result (cb v)]
-                                 result)))
+                               (cb v)))
                         +executor+))
 
      (-bind [it cb]
        (.thenComposeAsync it (reify Function
                                (apply [_ v]
-                                 (let [result (cb v)]
-                                   (if-not (instance? CompletionStage result)
-                                     (let [p (CompletableFuture.)]
-                                       (.complete p result)
-                                       p)
-                                     result))))
+                                 (cb v)))
                           +executor+))
 
      (-catch [it cb]

diff --git a/test/promesa/core_tests.cljc b/test/promesa/core_tests.cljc
@@ -308,17 +308,6 @@
 ;; Cats Integration Tests
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(t/deftest bind-with-ifn
-  (let [p (-> (p/promise {:x ::value})
-              (m/>>= :x))]
-    #?(:cljs
-       (t/async done
-         (p/then p (fn [x]
-                     (t/is (= x ::value))
-                     (done))))
-       :clj
-       (t/is (= @p ::value)))))
-
 #?(:cljs
    (t/deftest extract-from-rejected-promise
      (let [p1 (p/rejected 42)]
@@ -329,12 +318,14 @@
   #?(:cljs
      (t/async done
        (let [p1 (future-ok 200 2)
+             inc #(p/resolved (inc %))
              p2 (m/>>= p1 inc inc inc)]
          (p/then p2 (fn [v]
                       (t/is (= v 5))
                       (done)))))
      :clj
      (let [p1 (future-ok 200 2)
+           inc #(p/resolved (inc %))
            p2 (m/>>= p1 inc inc inc)]
        (t/is (= @p2 5)))))