From a73f7428fc11d32759976eed7db39aed7969a84d Mon Sep 17 00:00:00 2001
From: Maciej Szlosarczyk <maciej.szlosarczyk@eestiinternet.ee>
Date: Tue, 30 Jul 2019 13:46:55 +0300
Subject: [PATCH] Remove some code cuplication

---
 apps/epp_proxy/include/epp_proxy.hrl   | 7 ++++++-
 apps/epp_proxy/src/epp_http_client.erl | 4 ++--
 apps/epp_proxy/src/epp_tcp_worker.erl  | 6 ------
 apps/epp_proxy/src/epp_tls_worker.erl  | 9 ++-------
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/apps/epp_proxy/include/epp_proxy.hrl b/apps/epp_proxy/include/epp_proxy.hrl
index f1b0b0b..c2d3912 100644
--- a/apps/epp_proxy/include/epp_proxy.hrl
+++ b/apps/epp_proxy/include/epp_proxy.hrl
@@ -8,8 +8,13 @@
          epp_verb      % Epp verb that is targeted, plus 'error'
         }).
 
--type epp_request() :: #epp_request{}.
+-record(valid_frame, {command, cl_trid, raw_frame}).
 
+-record(invalid_frame, {code, cl_trid, message}).
+
+-record(state, {socket, session_id, headers}).
+
+-type epp_request() :: #epp_request{}.
 
 -define(XMLErrorCode, <<"2001">>).
 
diff --git a/apps/epp_proxy/src/epp_http_client.erl b/apps/epp_proxy/src/epp_http_client.erl
index effb476..91c5ff0 100644
--- a/apps/epp_proxy/src/epp_http_client.erl
+++ b/apps/epp_proxy/src/epp_http_client.erl
@@ -84,8 +84,8 @@ request_from_map(#{command := Command,
 %% Get hackney options
 hackney_options(Cookies) ->
     case application:get_env(epp_proxy, insecure) of
-      false -> [{cookies, Cookies}, insecure];
-      _ -> [{cookies, Cookies}]
+      false -> [{cookie, Cookies}, insecure];
+      _ -> [{cookie, Cookies}]
     end.
 
 %% Return form data or an empty list.
diff --git a/apps/epp_proxy/src/epp_tcp_worker.erl b/apps/epp_proxy/src/epp_tcp_worker.erl
index 5fb2579..8bd561e 100644
--- a/apps/epp_proxy/src/epp_tcp_worker.erl
+++ b/apps/epp_proxy/src/epp_tcp_worker.erl
@@ -12,12 +12,6 @@
 
 -export([code_change/3]).
 
--record(valid_frame, {command, cl_trid, raw_frame}).
-
--record(invalid_frame, {code, cl_trid, message}).
-
--record(state, {socket, session_id, headers}).
-
 %% Initialize process
 %% Assign an unique session id that will be passed on to http server as a cookie
 init(Socket) ->
diff --git a/apps/epp_proxy/src/epp_tls_worker.erl b/apps/epp_proxy/src/epp_tls_worker.erl
index 0f7bba0..1941251 100644
--- a/apps/epp_proxy/src/epp_tls_worker.erl
+++ b/apps/epp_proxy/src/epp_tls_worker.erl
@@ -12,12 +12,6 @@
 
 -export([code_change/3]).
 
--record(valid_frame, {command, cl_trid, raw_frame}).
-
--record(invalid_frame, {code, cl_trid, message}).
-
--record(state, {socket, session_id, headers}).
-
 %% Initialize process
 %% Assign an unique session id that will be passed on to http server as a cookie
 init(Socket) ->
@@ -171,7 +165,8 @@ log_on_invalid_handshake(Ip, Error) ->
 
 log_opened_connection(Ip) ->
     ReadableIp = epp_util:readable_ip(Ip),
-    lager:info("New client connection. IP: ~s, Process: ~p.~n",
+    lager:info("New client connection. IP: ~s, Process: "
+	       "~p.~n",
 	       [ReadableIp, self()]).
 
 %% Extract state info from socket. Fail if you must.