Normalize worker_channel exceptions

src/DistributedStdlibWorker.jl

@@ -69,7 +69,7 @@ function remote_do(f, w::DistributedStdlibWorker, args...; kwargs...)
 end
 
 function worker_channel(w::DistributedStdlibWorker, expr)
-    Core.eval(Main, quote
+    @transform_exception w Core.eval(Main, quote
         $(Distributed).RemoteChannel(() -> Core.eval(Main, $(QuoteNode(expr))), $(w.pid))
     end)
 end

src/Malt.jl

@@ -454,14 +454,18 @@ remote_eval_wait(w::AbstractWorker, expr) = remote_eval_wait(Main, w, expr)
     Malt.worker_channel(w::AbstractWorker, expr)
 
 Create a channel to communicate with worker `w`. `expr` must be an expression
-that evaluates to a Channel. `expr` should assign the Channel to a (global) variable
+that evaluates to an `AbstractChannel`. `expr` should assign the channel to a (global) variable
 so the worker has a handle that can be used to send messages back to the manager.
 """
 function worker_channel(w::Worker, expr)
     RemoteChannel(w, expr)
 end
 function worker_channel(w::InProcessWorker, expr)
-    Core.eval(w.host_module, expr)
+    remote_call_fetch(w) do
+        result = Core.eval(w.host_module, expr)
+        @assert result isa AbstractChannel
+        result
+    end
 end
 
 

src/worker.jl

@@ -156,7 +156,7 @@ function handle(::Val{MsgType.special_serialization_failure}, socket, msg, msg_i
     )
 end
 
-const _channel_cache = Dict{UInt64, Channel}()
+const _channel_cache = Dict{UInt64, AbstractChannel}()
 
 if abspath(PROGRAM_FILE) == @__FILE__
     main()

test/exceptions.jl

@@ -121,14 +121,14 @@ end
 
 
         # TODO
-        # @test_throws(
-        #     Exception,
-        #     m.worker_channel(w, :(123))
-        # )
-        # @test_throws(
-        #     Exception,
-        #     m.worker_channel(w, :(sqrt(-1)))
-        # )
+        @test_throws(
+            Exception,
+            m.worker_channel(w, :(123))
+        )
+        @test_throws(
+            m.RemoteException,
+            m.worker_channel(w, :(sqrt(-1)))
+        )
         @test m.remote_call_fetch(&, w, true, true)
     end