Rebase main

Author: Taras Tyshko

lib/nerves_hub/firmwares/update_tool/fwup.ex

@@ -244,8 +244,6 @@ defmodule NervesHub.Firmwares.UpdateTool.Fwup do
         {:error, :enoent} ->
           nil
       end
-    else
-      nil
     end
   end
 

lib/nerves_hub_web/channels/device_json_serializer.ex

@@ -16,25 +16,27 @@ defmodule NervesHubWeb.Channels.DeviceJSONSerializer do
 
   `device:[device_id]` => `device`
   """
+  alias Phoenix.Socket.V2.JSONSerializer
+
   @behaviour Phoenix.Socket.Serializer
 
   @impl Phoenix.Socket.Serializer
   def fastlane!(msg) do
     msg
     |> remove_device_id_from_topic()
-    |> Phoenix.Socket.V2.JSONSerializer.fastlane!()
+    |> JSONSerializer.fastlane!()
   end
 
   @impl Phoenix.Socket.Serializer
   def encode!(reply) do
     reply
     |> remove_device_id_from_topic()
-    |> Phoenix.Socket.V2.JSONSerializer.encode!()
+    |> JSONSerializer.encode!()
   end
 
   @impl Phoenix.Socket.Serializer
   def decode!(raw_message, opts) do
-    Phoenix.Socket.V2.JSONSerializer.decode!(raw_message, opts)
+    JSONSerializer.decode!(raw_message, opts)
     |> add_device_id_to_topic()
   end
 

test/nerves_hub_web/channels/websocket_test.exs

@@ -1003,7 +1003,7 @@ defmodule NervesHubWeb.WebsocketTest do
       not_before = DateTime.utc_now() |> Timex.shift(days: -1)
       not_after = DateTime.utc_now() |> Timex.shift(seconds: 1)
 
-      template = X509Template.new(:root_ca, validity: X509.Validity.new(not_before, not_after))
+      template = X509Template.new(:root_ca, validity: X509Validity.new(not_before, not_after))
 
       %{cert: ca, key: ca_key} = Fixtures.ca_certificate_fixture(org, template: template)