Transport => Channel

farmbot_ext/config/config.exs

@@ -1,7 +1,7 @@
 use Mix.Config
 config :logger, handle_otp_reports: true, handle_sasl_reports: true
 
-config :farmbot_ext, FarmbotExt.AMQP.NervesHubTransport,
+config :farmbot_ext, FarmbotExt.AMQP.NervesHubChannel,
   handle_nerves_hub_msg: FarmbotExt.HandleNervesHubMsg
 
 config :farmbot_celery_script, FarmbotCeleryScript.SysCalls,

farmbot_ext/lib/farmbot_ext/amqp/auto_sync_channel.ex

@@ -8,10 +8,7 @@ defmodule FarmbotExt.AMQP.AutoSyncChannel do
   use GenServer
   use AMQP
 
-  alias AMQP.{
-    Channel,
-    Queue
-  }
+  alias AMQP.{Channel, Queue}
 
   alias FarmbotCore.BotState
   alias FarmbotExt.AMQP.ConnectionWorker

farmbot_ext/lib/farmbot_ext/amqp/bot_state_channel.ex

@@ -1,4 +1,4 @@
-defmodule FarmbotExt.AMQP.BotStateTransport do
+defmodule FarmbotExt.AMQP.BotStateChannel do
   @moduledoc """
   Responsible for broadcasting the bot state tree over AMQP/MQTT
   """

farmbot_ext/lib/farmbot_ext/amqp/bot_state_ng_channel.ex

@@ -1,4 +1,4 @@
-defmodule FarmbotExt.AMQP.BotStateNGTransport do
+defmodule FarmbotExt.AMQP.BotStateNGChannel do
   @moduledoc """
   Publishes JSON encoded bot state fragements onto an AMQP channel
   Examples:

farmbot_ext/lib/farmbot_ext/amqp/celery_script_channel.ex

@@ -1,4 +1,4 @@
-defmodule FarmbotExt.AMQP.CeleryScriptTransport do
+defmodule FarmbotExt.AMQP.CeleryScriptChannel do
   @moduledoc """
   Handles inbound CeleryScript RPCs (from user via AMQP/MQTT).
   """

farmbot_ext/lib/farmbot_ext/amqp/channel_supervisor.ex

@@ -4,12 +4,12 @@ defmodule FarmbotExt.AMQP.ChannelSupervisor do
   alias FarmbotExt.JWT
 
   alias FarmbotExt.AMQP.{
-    NervesHubTransport,
+    NervesHubChannel,
     LogChannel,
-    BotStateTransport,
-    BotStateNGTransport,
+    BotStateChannel,
+    BotStateNGChannel,
     AutoSyncChannel,
-    CeleryScriptTransport
+    CeleryScriptChannel
   }
 
   def start_link(args) do
@@ -21,12 +21,12 @@ defmodule FarmbotExt.AMQP.ChannelSupervisor do
     jwt = JWT.decode!(token)
 
     children = [
-      {NervesHubTransport, [jwt: jwt]},
+      {NervesHubChannel, [jwt: jwt]},
       {LogChannel, [jwt: jwt]},
-      {BotStateTransport, [jwt: jwt]},
-      {BotStateNGTransport, [jwt: jwt]},
+      {BotStateChannel, [jwt: jwt]},
+      {BotStateNGChannel, [jwt: jwt]},
       {AutoSyncChannel, [jwt: jwt]},
-      {CeleryScriptTransport, [jwt: jwt]}
+      {CeleryScriptChannel, [jwt: jwt]}
     ]
 
     Supervisor.init(children, strategy: :one_for_one)

farmbot_ext/lib/farmbot_ext/amqp/nerves_hub_channel.ex

@@ -1,4 +1,4 @@
-defmodule FarmbotExt.AMQP.NervesHubTransport do
+defmodule FarmbotExt.AMQP.NervesHubChannel do
   use GenServer
   use AMQP
 
@@ -19,7 +19,7 @@ defmodule FarmbotExt.AMQP.NervesHubTransport do
     Mix.raise("""
     Please define a function that will handle NervesHub certs.
 
-        config :farmbot_ext, Farmbot.AMQP.NervesHubTransport,
+        config :farmbot_ext, Farmbot.AMQP.NervesHubChannel,
           handle_nerves_hub_msg: SomeModule
     """)
 

farmbot_ext/lib/farmbot_ext/handle_nerves_hub_msg.ex

@@ -1,5 +1,5 @@
 defmodule FarmbotExt.HandleNervesHubMsg do
-  @behaviour FarmbotExt.AMQP.NervesHubTransport
+  @behaviour FarmbotExt.AMQP.NervesHubChannel
   def configure_certs(_, _), do: :error
   def connect(), do: :error
 end

farmbot_os/config/host/dev.exs

@@ -35,8 +35,7 @@ config :farmbot, FarmbotOS.FirmwareTTYDetector,
     System.get_env("FARMBOT_TTY")
   ]
 
-config :farmbot_ext, FarmbotExt.AMQP.NervesHubTransport,
-  handle_nerves_hub_msg: FarmbotOS.NervesHub
+config :farmbot_ext, FarmbotExt.AMQP.NervesHubChannel, handle_nerves_hub_msg: FarmbotOS.NervesHub
 
 config :farmbot, FarmbotOS.NervesHub,
   farmbot_nerves_hub_handler: FarmbotOS.Platform.Host.NervesHubHandler

farmbot_os/config/host/test.exs

@@ -33,8 +33,7 @@ config :farmbot,
 
 config :farmbot, FarmbotOS.FirmwareTTYDetector, expected_names: []
 
-config :farmbot_ext, FarmbotExt.AMQP.NervesHubTransport,
-  handle_nerves_hub_msg: FarmbotOS.NervesHub
+config :farmbot_ext, FarmbotExt.AMQP.NervesHubChannel, handle_nerves_hub_msg: FarmbotOS.NervesHub
 
 config :farmbot, FarmbotOS.NervesHub,
   farmbot_nerves_hub_handler: FarmbotOS.Platform.Host.NervesHubHandler

farmbot_os/config/target/dev.exs

@@ -67,8 +67,7 @@ config :farmbot, FarmbotOS.Platform.Supervisor,
     FarmbotOS.Platform.Target.InfoWorker.Supervisor
   ]
 
-config :farmbot_ext, FarmbotExt.AMQP.NervesHubTransport,
-  handle_nerves_hub_msg: FarmbotOS.NervesHub
+config :farmbot_ext, FarmbotExt.AMQP.NervesHubChannel, handle_nerves_hub_msg: FarmbotOS.NervesHub
 
 config :farmbot, FarmbotOS.NervesHub,
   farmbot_nerves_hub_handler: FarmbotOS.Platform.Target.NervesHubClient

farmbot_os/config/target/prod.exs

@@ -58,7 +58,7 @@ config :farmbot, Farmbot.Platform.Supervisor,
     Farmbot.TTYDetector
   ]
 
-config :farmbot_ext, Farmbot.AMQP.NervesHubTransport,
+config :farmbot_ext, Farmbot.AMQP.NervesHubChannel,
   handle_nerves_hub_msg: Farmbot.System.NervesHub
 
 config :farmbot, Farmbot.System.NervesHub,

farmbot_os/lib/farmbot_os/nerves_hub.ex

@@ -22,7 +22,7 @@ defmodule FarmbotOS.NervesHub do
   alias FarmbotCore.Asset.{Repo, DeviceCert}
   import FarmbotCore.Config, only: [get_config_value: 3]
 
-  @behaviour FarmbotExt.AMQP.NervesHubTransport
+  @behaviour FarmbotExt.AMQP.NervesHubChannel
 
   @handler Application.get_env(:farmbot, __MODULE__)[:farmbot_nerves_hub_handler] ||
              Mix.raise("missing :farmbot_nerves_hub_handler module")

farmbot_os/lib/farmbot_os/sys_calls.ex

@@ -17,7 +17,7 @@ defmodule FarmbotOS.SysCalls do
   defdelegate flash_firmware(package), to: FlashFirmware
 
   def read_status do
-    :ok = FarmbotExt.AMQP.BotStateNGTransport.force()
+    :ok = FarmbotExt.AMQP.BotStateNGChannel.force()
   end
 
   def set_user_env(key, value) do