[GH-#69] GET /info, project cleanup

Author: d-velev

apps/aecore/lib/aecore/peers/worker.ex

@@ -1,11 +1,14 @@
 defmodule Aecore.Peers.Worker do
+  @moduledoc """
+  Peer manager module
+  """
+
+  use GenServer
 
   alias Aehttpclient.Client
   alias Aecore.Structures.Block
   alias Aecore.Utils.Blockchain.BlockValidation
 
-  use GenServer
-
   def start_link do
     GenServer.start_link(__MODULE__, [], name: __MODULE__)
   end
@@ -16,7 +19,7 @@ defmodule Aecore.Peers.Worker do
 
   @spec add_peer(term) :: :ok | :error
   def add_peer(uri) do
-    GenServer.call(__MODULE__, {:add_peer, uri})
+    GenServer.call(__MODULE__, {:add_peer, uri},15000)
   end
 
   @spec remove_peer(term) :: :ok | :error
@@ -42,30 +45,35 @@ defmodule Aecore.Peers.Worker do
   end
 
   def handle_call({:add_peer,uri}, _from, peers) do
-    case(Client.get_info(uri)) do
-      {:ok, info} ->
-        if(Map.get(info,"genesis_block_hash") == genesis_block_header_hash()) do
-          {:reply, :ok, [uri | peers]}
-        else
+    if(!Enum.member?(peers,uri)) do
+      case(Client.get_info(uri)) do
+        {:ok, info} ->
+          if(Map.get(info,"genesis_block_hash") == genesis_block_header_hash()) do
+            {:reply, :ok, [uri | peers]}
+          else
+            {:reply, {:error, "Genesis header hash not valid"}, peers}
+          end
+        :error ->
           {:reply, :error, peers}
-        end
-      :error ->
-        {:reply, :error, peers}
+      end
+    else
+      {:reply, {:error, "Peer already in list"}, peers}
     end
   end
 
   def handle_call({:remove_peer, uri}, _from, peers) do
     if(Enum.member?(peers,uri)) do
       {:reply, :ok, List.delete(peers, uri)}
     else
-      {:reply, :error, peers}
+      {:reply, {:error, "Peer not found"}, peers}
     end
   end
 
   def handle_call(:check_peers, _from, peers) do
     updated_peers = Enum.filter(peers, fn(peer) ->
-      {status, _} = Client.get_info(peer)
-      :ok = status
+      {status, info} = Client.get_info(peer)
+      :ok == status &&
+        Map.get(info,"genesis_block_hash") == genesis_block_header_hash()
       end)
     {:reply, :ok, updated_peers}
   end

apps/aecore/test/aecore_peers_test.exs

@@ -0,0 +1,21 @@
+defmodule AecorePeersTest do
+
+  use ExUnit.Case
+
+  alias Aecore.Peers.Worker, as: Peers
+
+  setup do
+    Peers.start_link()
+    []
+  end
+
+  test "add peer, get all peers, check peers and remove the peer" do
+    assert :ok = Peers.add_peer("localhost:4000")
+    assert {:error, "Peer already in list"} = Peers.add_peer("localhost:4000")
+    assert Enum.count(Peers.all_peers) == 1
+    assert :ok = Peers.check_peers
+    assert :ok = Peers.remove_peer("localhost:4000")
+    assert {:error, "Peer not found"} = Peers.remove_peer("localhost:4001")
+  end
+
+end

apps/aehttpclient/lib/client.ex

@@ -1,7 +1,7 @@
 defmodule Aehttpclient.Client do
 
   def get_info(uri) do
-    case(HTTPoison.get(uri <> "/info",[recv_timeout: 10000000])) do
+    case(HTTPoison.get(uri <> "/info")) do
       {:ok, %{body: body, status_code: 200}} ->
         response = Poison.decode!(body)
         {:ok, response}

apps/aehttpserver/config/config.exs

@@ -7,8 +7,6 @@ use Mix.Config
 
 # Configures the endpoint
 config :aehttpserver, Aehttpserver.Endpoint,
-  url: [host: "localhost"],
-  secret_key_base: "5OCr9Ljxr0s8cSx36fmjKgi6hWETJeoxH+jMvBSNDCO/pt0Zqo1S0+EGGJ2VyOoa",
   render_errors: [view: Aehttpserver.ErrorView, accepts: ~w(html json)],
   pubsub: [name: Aehttpserver.PubSub,
            adapter: Phoenix.PubSub.PG2]

apps/aehttpserver/config/test.exs

@@ -3,8 +3,8 @@ use Mix.Config
 # We don't run a server during test. If one is required,
 # you can enable the server option below.
 config :aehttpserver, Aehttpserver.Endpoint,
-  http: [port: 4001],
-  server: false
+  http: [port: 4000],
+  server: true
 
 # Print only warnings and errors during test
 config :logger, level: :warn