tests pass

diff --git a/coveralls.json b/coveralls.json
index 43d140c026237d5afd8053d7e0445923493c7d37..d03e2ce7cec9734b00a4ad9ac6ad037c08f5cb56 100644 (file)
--- a/coveralls.json
+++ b/coveralls.json
@@ -1,6 +1,6 @@
 {
   "coverage_options": {
-    "minimum_coverage": 77.6
+    "minimum_coverage": 83
   },
   "skip_files": [
     "test/support"

diff --git a/lib/router/admin.ex b/lib/router/admin.ex
index 4f838d8225232d462e3ac8c14ede3d2aa999995c..ce19a1d74e4eb5da0151b80df1626f95c03532f0 100644 (file)
--- a/lib/router/admin.ex
+++ b/lib/router/admin.ex
@@ -2,11 +2,12 @@ defmodule Wampex.Router.Admin do
   @moduledoc false
   use GenServer
   require Logger
+
   alias Wampex.Roles.Dealer.{Invocation, Result}
   alias Wampex.Roles.Peer.Error
   alias Wampex.Router.Authentication.{Peer, Realm}
   alias Wampex.Router.Realms
-  alias Realms.Session, as: RealmSession
+  alias Wampex.Router.Realms.Session, as: RealmSession
 
   @procedures [
     "admin.create_peer",

diff --git a/lib/router/authentication.ex b/lib/router/authentication.ex
index 87bc3490775618db18d51e58ba2c8656683c75db..b0d90e5d081069cd171fc9f1b9b39f1ed8570efd 100644 (file)
--- a/lib/router/authentication.ex
+++ b/lib/router/authentication.ex
@@ -4,8 +4,8 @@ defmodule Wampex.Router.Authentication do
   require Logger
 
   alias Wampex.Crypto
+  alias Wampex.Router.Authentication.{Peer, Realm}
   alias Wampex.Serializers.JSON
-  alias Wampex.Router.Authentication.{Realm, Peer}
 
   @wampcra "wampcra"
   @auth_provider "userdb"

diff --git a/lib/router/authentication/peer.ex b/lib/router/authentication/peer.ex
index ad6ed5fca15158899da9ef01dd48de0cb5b09395..6a35ac2ba1639c70a9f4e2af45c8253cd6f2becc 100644 (file)
--- a/lib/router/authentication/peer.ex
+++ b/lib/router/authentication/peer.ex
@@ -48,24 +48,22 @@ defmodule Wampex.Router.Authentication.Peer do
     salt = Crypto.random_string(keylen)
     iterations = Enum.random(10_000..50_000)
 
-    try do
-      password = Crypto.pbkdf2(password, salt, iterations, keylen)
+    password = Crypto.pbkdf2(password, salt, iterations, keylen)
 
-      {:ok, u} =
-        %Peer{
-          authid: authid,
-          password: password,
-          realm: realm,
-          salt: salt,
-          iterations: iterations,
-          keylen: keylen
-        }
-        |> Repo.insert()
+    {:ok, u} =
+      %Peer{
+        authid: authid,
+        password: password,
+        realm: realm,
+        salt: salt,
+        iterations: iterations,
+        keylen: keylen
+      }
+      |> Repo.insert()
 
-      u
-    rescue
-      _er ->
-        get(authid: authid, realm: realm)
-    end
+    u
+  rescue
+    _er ->
+      get(authid: authid, realm: realm)
   end
 end

diff --git a/lib/router/authentication/realm.ex b/lib/router/authentication/realm.ex
index 10fa68bc340b82f0684029c7b63cd3bacdf7212f..4d2632cb12f87cd123e7dff8b2af05b8df3438cf 100644 (file)
--- a/lib/router/authentication/realm.ex
+++ b/lib/router/authentication/realm.ex
@@ -27,15 +27,12 @@ defmodule Wampex.Router.Authentication.Realm do
   end
 
   def create(uri: uri) do
-    try do
-      {:ok, r} =
-        %Realm{uri: uri, parent: uri}
-        |> Repo.insert()
+    {:ok, r} =
+      %Realm{uri: uri, parent: uri}
+      |> Repo.insert()
 
-      r
-    rescue
-      _er ->
-        get(uri: uri)
-    end
+    r
+  rescue
+    _er -> get(uri: uri)
   end
 end

diff --git a/lib/router/session.ex b/lib/router/session.ex
index b9b3e9d18a0c40aeb1c8e25a0e837bd51d84f23b..07af4408f74d70e0ee9fea71680ac528ed9901a0 100644 (file)
--- a/lib/router/session.ex
+++ b/lib/router/session.ex
@@ -4,19 +4,20 @@ defmodule Wampex.Router.Session do
   """
   use StatesLanguage, data: "priv/router.json"
 
-  alias __MODULE__, as: Sess
   alias StatesLanguage, as: SL
-  alias Wampex.Roles.{Broker, Callee, Caller, Dealer, Peer, Publisher, Subscriber}
+  alias Wampex.Roles.{Broker, Caller, Dealer, Peer}
+  alias Wampex.Roles.Broker.{Event, Published, Subscribed, Unsubscribed}
+  alias Wampex.Roles.Callee.{Register, Unregister, Yield}
+  alias Wampex.Roles.Caller.Call
+  alias Wampex.Roles.Dealer.{Invocation, Registered, Result, Unregistered}
   alias Wampex.Roles.Peer.{Abort, Authenticate, Challenge, Error, Hello, Welcome}
+  alias Wampex.Roles.Publisher.Publish
+  alias Wampex.Roles.Subscriber.{Subscribe, Unsubscribe}
   alias Wampex.Router
-  alias Broker.{Subscribed, Published, Event, Unsubscribed}
-  alias Callee.{Register, Unregister, Yield}
-  alias Caller.Call
-  alias Dealer.{Invocation, Registered, Result, Unregistered}
-  alias Publisher.Publish
-  alias Router.{Authentication, Realms}
-  alias Realms.Session, as: RealmSession
-  alias Subscriber.{Subscribe, Unsubscribe}
+  alias Wampex.Router.{Authentication, Realms}
+  alias Wampex.Router.Realms
+  alias Wampex.Router.Realms.Session, as: RealmSession
+  alias __MODULE__, as: Sess
 
   @enforce_keys [:transport, :transport_pid]
   defstruct [
@@ -113,7 +114,7 @@ defmodule Wampex.Router.Session do
   # @handle_interrupt "HandleInterrupt"
   @handle_abort "HandleAbort"
   @handle_goodbye "HandleGoodbye"
-  # @handle_cancel "HandleCancel" 
+  # @handle_cancel "HandleCancel"
 
   @impl true
   def handle_resource(

diff --git a/test/wampex_test.exs b/test/wampex_test.exs
index 33a52d08b0556fe61f530fa12ee17a20ddc0851f..0e980c17e2c3712710dd7091b3090b17c42a0b5c 100644 (file)
--- a/test/wampex_test.exs
+++ b/test/wampex_test.exs
@@ -2,19 +2,15 @@ defmodule WampexTest do
   use ExUnit.Case, async: true
   doctest Wampex
 
-  alias Wampex.Client.{Authentication, Realm}
   alias Wampex.Client
-  alias Wampex.Roles.{Broker, Callee, Caller, Dealer, Peer, Publisher, Subscriber}
+  alias Wampex.Client.{Authentication, Realm, Session}
+  alias Wampex.Roles.Broker.Event
+  alias Wampex.Roles.{Callee, Caller, Peer, Publisher, Subscriber}
+  alias Wampex.Roles.Caller.Call
+  alias Wampex.Roles.Dealer.{Invocation, Result}
+  alias Wampex.Roles.Peer.Hello
+  alias Wampex.Roles.Publisher.Publish
   alias Wampex.Router
-  alias Wampex.Serializers.{JSON, MessagePack}
-  alias Broker.{Event, Published, Subscribed, Unsubscribed}
-  alias Callee.{Register, Unregister, Yield}
-  alias Caller.Call
-  alias Client.Session
-  alias Dealer.{Invocation, Registered, Result, Unregistered}
-  alias Peer.{Authenticate, Goodbye, Hello}
-  alias Publisher.Publish
-  alias Subscriber.{Subscribe, Unsubscribe}
   require Logger
 
   @url "ws://localhost:4000/ws"