             [frereth-cp.message.constants :as K]
             [frereth-cp.message.helpers :as help]
             [frereth-cp.message.specs :as specs]
-            ;; TODO: Refactor-rename this to log
-            [frereth-cp.shared.logging :as log2]
+            [frereth-cp.shared.logging :as log]
             [frereth-cp.util :as utils]
             [manifold.deferred :as dfrd]
             [manifold.stream :as strm])


(s/fdef read-bytes-from-parent!
        :args (s/cat :io-handle ::specs/io-handle
                     :log-state ::log2/state
                     :buffer bytes?)
        :ret (s/keys :req  [::log2/state
                            ::specs/bs-or-eof]))
(defn read-bytes-from-parent!
  "Parent wrote bytes to its outbuffer. Read them."

(defn write-bytes-to-child-stream!
  "Forward the byte-array inside the buffer"
  [parent-trigger
   {log-state ::log/state
    :as state}
   ^ByteBuf buf]
  ;; This was really just refactored out of the middle of a reduce call,
