From 9a2098b6a7b17ea7cae6ad841919921dd7f445b1 Mon Sep 17 00:00:00 2001 From: Christopher Date: Fri, 17 Apr 2020 09:18:05 -0500 Subject: [PATCH] update wampex --- mix.exs | 14 +++----------- mix.lock | 5 +++-- test/wampex_test.exs | 4 ++-- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/mix.exs b/mix.exs index 4360cc1..83d4f36 100644 --- a/mix.exs +++ b/mix.exs @@ -41,20 +41,13 @@ defmodule Wampex.Router.MixProject do {:cluster_kv, git: "https://gitlab.com/entropealabs/cluster_kv.git", tag: "d3bb958de67ef22304f24641661261a1c2df684d"}, {:cors_plug, "~> 2.0"}, - {:credo, "~> 1.2", only: [:dev, :test], runtime: false}, - {:dialyxir, "~> 0.5.1", only: [:dev, :test], runtime: false}, + {:credo, "~> 1.2", only: [:test], runtime: false}, + {:dialyxir, "~> 0.5.1", only: [:test], runtime: false}, {:ex_doc, "~> 0.21", only: :dev, runtime: false}, - {:excoveralls, "~> 0.12.2", only: [:dev, :test], runtime: false}, {:jason, "~> 1.1"}, - {:msgpack, "~> 0.7.0"}, {:plug_cowboy, "~> 2.1"}, {:states_language, "~> 0.2"}, - {:wampex, git: "https://gitlab.com/entropealabs/wampex.git", tag: "7d656d9748cb0e4d08c625d87e315839afecb4b2"}, - # {:wampex_client, path: "../wampex_client", only: [:dev, :test]} - {:wampex_client, - git: "https://gitlab.com/entropealabs/wampex_client.git", - tag: "a6478667525bbc048215a94ec237a6b45f9009f1", - only: [:dev, :test]} + {:wampex, git: "https://gitlab.com/entropealabs/wampex.git", tag: "ecba713117f1e048829be79f19373952638c6ece"} ] end @@ -64,7 +57,6 @@ defmodule Wampex.Router.MixProject do "compile --force --warnings-as-errors", "credo --strict", "format --check-formatted", - "coveralls", "dialyzer --halt-exit-status" ] ] diff --git a/mix.lock b/mix.lock index 904a656..0c56c0a 100644 --- a/mix.lock +++ b/mix.lock @@ -24,6 +24,7 @@ "mime": {:hex, :mime, "1.3.1", "30ce04ab3175b6ad0bdce0035cba77bba68b813d523d1aac73d9781b4d193cf8", [:mix], [], "hexpm", "6cbe761d6a0ca5a31a0931bf4c63204bceb64538e664a8ecf784a9a6f3b875f1"}, "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"}, "msgpack": {:hex, :msgpack, "0.7.0", "128ae0a2227c7e7a2847c0f0f73551c268464f8c1ee96bffb920bc0a5712b295", [:rebar3], [], "hexpm", "4649353da003e6f438d105e4b1e0f17757f6f5ec8687a6f30875ff3ac4ce2a51"}, + "msgpax": {:hex, :msgpax, "2.2.4", "7b3790ef684089076b63c0f08c2f4b079c6311daeb006b69e4ed2bf67518291e", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "b351b6d992d79624a8430a99d21a41b36b1b90edf84326a294e9f4a2de11f089"}, "nimble_parsec": {:hex, :nimble_parsec, "0.5.3", "def21c10a9ed70ce22754fdeea0810dafd53c2db3219a0cd54cf5526377af1c6", [:mix], [], "hexpm", "589b5af56f4afca65217a1f3eb3fee7e79b09c40c742fddc1c312b3ac0b3399f"}, "parse_trans": {:hex, :parse_trans, "3.3.0", "09765507a3c7590a784615cfd421d101aec25098d50b89d7aa1d66646bc571c1", [:rebar3], [], "hexpm", "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960"}, "pbkdf2": {:hex, :pbkdf2, "2.0.0", "11c23279fded5c0027ab3996cfae77805521d7ef4babde2bd7ec04a9086cf499", [:rebar3], [], "hexpm", "1e793ce6fdb0576613115714deae9dfc1d1537eaba74f07efb36de139774488d"}, @@ -36,8 +37,8 @@ "states_language": {:hex, :states_language, "0.2.8", "f9dfd3c0bd9a9d7bda25ef315f2d90944cd6b2022a7f3c403deb1d4ec451825e", [:mix], [{:elixpath, "~> 0.1.0", [hex: :elixpath, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:json_xema, "~> 0.4.0", [hex: :json_xema, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:xema, "~> 0.11.0", [hex: :xema, repo: "hexpm", optional: false]}], "hexpm", "a5231691e7cb37fe32dc7de54c2dc86d1d60e84c4f0379f3246e55be2a85ec78"}, "telemetry": {:hex, :telemetry, "0.4.1", "ae2718484892448a24470e6aa341bc847c3277bfb8d4e9289f7474d752c09c7f", [:rebar3], [], "hexpm", "4738382e36a0a9a2b6e25d67c960e40e1a2c95560b9f936d8e29de8cd858480f"}, "unicode_util_compat": {:hex, :unicode_util_compat, "0.4.1", "d869e4c68901dd9531385bb0c8c40444ebf624e60b6962d95952775cac5e90cd", [:rebar3], [], "hexpm", "1d1848c40487cdb0b30e8ed975e34e025860c02e419cb615d255849f3427439d"}, - "wampex": {:git, "https://gitlab.com/entropealabs/wampex.git", "7d656d9748cb0e4d08c625d87e315839afecb4b2", [tag: "7d656d9748cb0e4d08c625d87e315839afecb4b2"]}, - "wampex_client": {:git, "https://gitlab.com/entropealabs/wampex_client.git", "a6478667525bbc048215a94ec237a6b45f9009f1", [tag: "a6478667525bbc048215a94ec237a6b45f9009f1"]}, + "wampex": {:git, "https://gitlab.com/entropealabs/wampex.git", "ecba713117f1e048829be79f19373952638c6ece", [tag: "ecba713117f1e048829be79f19373952638c6ece"]}, + "wampex_client": {:git, "https://gitlab.com/entropealabs/wampex_client.git", "39b586067b106c492b701f0f6e85b4abcbf5faa1", [tag: "master"]}, "websockex": {:hex, :websockex, "0.4.2", "9a3b7dc25655517ecd3f8ff7109a77fce94956096b942836cdcfbc7c86603ecc", [:mix], [], "hexpm", "803cd76e91544b56f0e655e36790be797fa6436db9224f7c303db9b9df2a3df4"}, "xema": {:hex, :xema, "0.11.0", "7b5118418633cffc27092110d02d4faeea938149dd3f6c64299e41e747067e80", [:mix], [{:conv_case, "~> 0.2.2", [hex: :conv_case, repo: "hexpm", optional: false]}, {:decimal, "~> 1.7", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "51491c9a953d65069d4b30aa2f70bc45ff99fd1bc3345bc72ce4e644d01ea14e"}, } diff --git a/test/wampex_test.exs b/test/wampex_test.exs index c38ed57..73ddd65 100644 --- a/test/wampex_test.exs +++ b/test/wampex_test.exs @@ -15,7 +15,7 @@ defmodule WampexTest do alias Wampex.Router.AuthorizationImpl require Logger - @url "ws://localhost:4000/ws" + @url "ws://localhost:5999/ws" @authid "admin" @auth_password "bnASR5qF9y8k/sHF6S+NneCOhvVI0zFkvoKQpc2F+hA=" @realm_uri "admin" @@ -31,7 +31,7 @@ defmodule WampexTest do server: Router.start_link( name: TestRouter, - port: 4000, + port: 5999, topologies: topologies, replicas: 1, quorum: 1, -- 2.45.3