From 1fce146504b471331b32144552309c7642743179 Mon Sep 17 00:00:00 2001
From: Rick Carlino <rick.carlino@gmail.com>
Date: Wed, 5 Feb 2020 15:38:52 -0600
Subject: [PATCH] Remove :telemetry_layer stuff now that Mimic is a thing

---
 farmbot_os/config/config.exs                  | 25 ++++++-------------
 .../lib/farmbot_os/configurator/router.ex     |  8 ++----
 .../farmbot_os/configurator/router_test.exs   | 18 +++++++------
 3 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/farmbot_os/config/config.exs b/farmbot_os/config/config.exs
index 37a35443..533cd15d 100644
--- a/farmbot_os/config/config.exs
+++ b/farmbot_os/config/config.exs
@@ -1,7 +1,6 @@
 use Mix.Config
 
-config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.FarmEvent,
-  checkup_time_ms: 10_000
+config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.FarmEvent, checkup_time_ms: 10_000
 
 config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.RegimenInstance,
   checkup_time_ms: 10_000
@@ -19,11 +18,9 @@ config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.PinBinding,
   gpio_handler: FarmbotCore.PinBindingWorker.StubGPIOHandler,
   error_retry_time_ms: 30_000
 
-config :farmbot_core, FarmbotCore.Leds,
-  gpio_handler: FarmbotCore.Leds.StubHandler
+config :farmbot_core, FarmbotCore.Leds, gpio_handler: FarmbotCore.Leds.StubHandler
 
-config :farmbot_core, FarmbotCore.JSON,
-  json_parser: FarmbotCore.JSON.JasonParser
+config :farmbot_core, FarmbotCore.JSON, json_parser: FarmbotCore.JSON.JasonParser
 
 # Customize non-Elixir parts of the firmware.  See
 # https://hexdocs.pm/nerves/advanced-configuration.html for details.
@@ -46,15 +43,13 @@ config :farmbot_core, FarmbotCore.EctoMigrator,
       "beta"
     )
 
-config :farmbot_celery_script, FarmbotCeleryScript.SysCalls,
-  sys_calls: FarmbotOS.SysCalls
+config :farmbot_celery_script, FarmbotCeleryScript.SysCalls, sys_calls: FarmbotOS.SysCalls
 
 config :farmbot_core, FarmbotCore.BotState.FileSystem,
   root_dir: "/tmp/farmbot_state",
   sleep_time: 200
 
-config :farmbot_core, FarmbotCore.FarmwareRuntime,
-  runtime_dir: "/tmp/farmware_runtime"
+config :farmbot_core, FarmbotCore.FarmwareRuntime, runtime_dir: "/tmp/farmware_runtime"
 
 config :ecto, json_library: FarmbotCore.JSON
 
@@ -65,17 +60,13 @@ config :farmbot_core,
     FarmbotCore.Asset.Repo
   ]
 
-config :farmbot_ext, FarmbotExt.API.Preloader,
-  preloader_impl: FarmbotExt.API.Preloader.HTTP
+config :farmbot_ext, FarmbotExt.API.Preloader, preloader_impl: FarmbotExt.API.Preloader.HTTP
 
 config :farmbot, FarmbotOS.FileSystem, data_path: "/tmp/farmbot"
 
-config :farmbot, FarmbotOS.System,
-  system_tasks: FarmbotOS.Platform.Host.SystemTasks
+config :farmbot, FarmbotOS.System, system_tasks: FarmbotOS.Platform.Host.SystemTasks
 
-config :farmbot, FarmbotOS.Configurator,
-  network_layer: FarmbotOS.Configurator.FakeNetworkLayer,
-  telemetry_layer: FarmbotOS.Configurator.DetsTelemetryLayer
+config :farmbot, FarmbotOS.Configurator, network_layer: FarmbotOS.Configurator.FakeNetworkLayer
 
 config :farmbot, FarmbotOS.Platform.Supervisor,
   platform_children: [
diff --git a/farmbot_os/lib/farmbot_os/configurator/router.ex b/farmbot_os/lib/farmbot_os/configurator/router.ex
index 144291e9..31c20a4e 100644
--- a/farmbot_os/lib/farmbot_os/configurator/router.ex
+++ b/farmbot_os/lib/farmbot_os/configurator/router.ex
@@ -23,12 +23,8 @@ defmodule FarmbotOS.Configurator.Router do
   plug(:match)
   plug(:dispatch)
 
-  @network_layer Application.get_env(:farmbot, FarmbotOS.Configurator)[
-                   :network_layer
-                 ]
-  @telemetry_layer Application.get_env(:farmbot, FarmbotOS.Configurator)[
-                     :telemetry_layer
-                   ]
+  @network_layer Application.get_env(:farmbot, FarmbotOS.Configurator)[:network_layer]
+  @telemetry_layer FarmbotOS.Configurator.DetsTelemetryLayer
 
   # Trigger for captive portal for various operating systems
   get("/gen_204", do: redir(conn, "/"))
diff --git a/farmbot_os/test/farmbot_os/configurator/router_test.exs b/farmbot_os/test/farmbot_os/configurator/router_test.exs
index a3202517..277ab46b 100644
--- a/farmbot_os/test/farmbot_os/configurator/router_test.exs
+++ b/farmbot_os/test/farmbot_os/configurator/router_test.exs
@@ -401,18 +401,22 @@ defmodule FarmbotOS.Configurator.RouterTest do
   end
 
   test "/finish" do
-    expect(ConfigDataLayer, :save_config, 1, fn conf ->
+    expect(ConfigDataLayer, :save_config, 1, fn _conf ->
       :ok
     end)
 
+    # This data would crash in the real app because it is incomplete.
+    # Maybe we should add an error handler?
+    fake_session = %{
+      "ifname" => "MY_IFNAME",
+      "auth_config_email" => "MY_EMAIL",
+      "auth_config_password" => "MY_PASS",
+      "auth_config_server" => "MY_SERVER"
+    }
+
     kon =
       conn(:get, "/finish")
-      |> init_test_session(%{
-        "ifname" => "MY_IFNAME",
-        "auth_config_email" => "MY_EMAIL",
-        "auth_config_password" => "MY_PASS",
-        "auth_config_server" => "MY_SERVER"
-      })
+      |> init_test_session(fake_session)
       |> Router.call(@opts)
 
     assert String.contains?(