better types

7 files changed, 16 insertions, 18 deletions

diff --git a/src/rabbit.erl b/src/rabbit.erl
index 5c6bb08a..e6bc240e 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -40,7 +40,7 @@
 -export([log_location/1]).
 
 -export_type([regexp/0, txn/0, thunk/1,maybe/1, info/0, info_key/0,
-              msg_id/0, erlang_node/0, message/0, basic_message/0,
+              msg_id/0, message/0, basic_message/0,
               delivery/0, content/0, decoded_content/0, undecoded_content/0,
               unencoded_content/0, encoded_content/0, vhost/0, ctag/0,
               ip_port/0, hostname/0]).
@@ -191,7 +191,6 @@
 -ifdef(use_specs).
 
 -type(maybe(T) :: T | 'none').
--type(erlang_node() :: atom()).
 -type(thunk(T) :: fun(() -> T)).
 -type(regexp() :: binary()).
 -type(vhost() :: binary()).
@@ -251,8 +250,8 @@
 -spec(rotate_logs/1 :: (file_suffix()) -> 'ok' | {'error', any()}).
 -spec(status/0 :: () ->
              [{running_applications, [{atom(), string(), string()}]} |
-              {nodes, [{rabbit_mnesia:node_type(), [erlang_node()]}]} |
-              {running_nodes, [erlang_node()]}]).
+              {nodes, [{rabbit_mnesia:node_type(), [node()]}]} |
+              {running_nodes, [node()]}]).
 -spec(log_location/1 :: ('sasl' | 'kernel') -> log_location()).
 
 -endif.
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index 96c7058d..7b9fcaac 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -126,7 +126,7 @@
 -spec(update_ram_duration/1 :: (pid()) -> 'ok').
 -spec(set_ram_duration_target/2 :: (pid(), number() | 'infinity') -> 'ok').
 -spec(set_maximum_since_use/2 :: (pid(), non_neg_integer()) -> 'ok').
--spec(on_node_down/1 :: (rabbit:erlang_node()) -> 'ok').
+-spec(on_node_down/1 :: (node()) -> 'ok').
 -spec(pseudo_queue/2 :: (binary(), pid()) -> amqqueue()).
 
 -endif.
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index 4aab0dce..95a49f86 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -44,7 +44,7 @@
 
 -spec(start/0 :: () -> no_return()).
 -spec(stop/0 :: () -> 'ok').
--spec(action/4 :: (atom(), rabbit:erlang_node(), [string()],
+-spec(action/4 :: (atom(), node(), [string()],
                    fun ((string(), [any()]) -> 'ok')) -> 'ok').
 -spec(usage/0 :: () -> no_return()).
 
diff --git a/src/rabbit_load.erl b/src/rabbit_load.erl
index 4f467162..e0457b1e 100644
--- a/src/rabbit_load.erl
+++ b/src/rabbit_load.erl
@@ -40,11 +40,10 @@
 
 -ifdef(use_specs).
 
--type(erlang_node() :: atom()).
--type(load() :: {{non_neg_integer(), integer() | 'unknown'}, erlang_node()}).
+-type(load() :: {{non_neg_integer(), integer() | 'unknown'}, node()}).
 -spec(local_load/0 :: () -> load()).
 -spec(remote_loads/0 :: () -> [load()]).
--spec(pick/0 :: () -> erlang_node()).
+-spec(pick/0 :: () -> node()).
 
 -endif.
 
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index 92ca6c0a..b247f486 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -86,7 +86,7 @@
                 kind         :: Kind,
                 name         :: resource_name()}).
 
--spec(method_record_type/1 :: (tuple()) -> atom()).
+-spec(method_record_type/1 :: (rabbit_framing:amqp_method_record()) -> atom()).
 -spec(polite_pause/0 :: () -> 'done').
 -spec(polite_pause/1 :: (non_neg_integer()) -> 'done').
 -spec(die/1 :: (atom()) -> no_return()).
@@ -126,8 +126,8 @@
                                 rabbit:vhost(), rabbit:thunk(A)) -> A).
 -spec(execute_mnesia_transaction/1 :: (rabbit:thunk(A)) -> A).
 -spec(ensure_ok/2 :: (ok_or_error(), atom()) -> 'ok').
--spec(makenode/1 :: ({string(), string()} | string()) -> rabbit:erlang_node()).
--spec(nodeparts/1 :: (rabbit:erlang_node() | string()) -> {string(), string()}).
+-spec(makenode/1 :: ({string(), string()} | string()) -> node()).
+-spec(nodeparts/1 :: (node() | string()) -> {string(), string()}).
 -spec(cookie_hash/0 :: () -> string()).
 -spec(tcp_name/3 :: (atom(), inet:ip_address(), rabbit:ip_port()) -> atom()).
 -spec(intersperse/2 :: (A, [A]) -> [A]).
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index a3cac45c..d1d90dbf 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -51,13 +51,13 @@
 -ifdef(use_specs).
 
 -type(node_type() :: disc_only | disc | ram | unknown).
--spec(status/0 :: () -> [{'nodes', [{node_type(), [rabbit:erlang_node()]}]} |
-                         {'running_nodes', [rabbit:erlang_node()]}]).
+-spec(status/0 :: () -> [{'nodes', [{node_type(), [node()]}]} |
+                         {'running_nodes', [node()]}]).
 -spec(dir/0 :: () -> file:filename()).
 -spec(ensure_mnesia_dir/0 :: () -> 'ok').
 -spec(init/0 :: () -> 'ok').
 -spec(is_db_empty/0 :: () -> boolean()).
--spec(cluster/1 :: ([rabbit:erlang_node()]) -> 'ok').
+-spec(cluster/1 :: ([node()]) -> 'ok').
 -spec(reset/0 :: () -> 'ok').
 -spec(force_reset/0 :: () -> 'ok').
 -spec(is_clustered/0 :: () -> boolean()).
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl
index 758741e8..6213811c 100644
--- a/src/rabbit_networking.erl
+++ b/src/rabbit_networking.erl
@@ -66,7 +66,7 @@
 -type(connection() :: pid()).
 
 -type(listener() ::
-      #listener{node     :: rabbit:erlang_node(),
+      #listener{node     :: node(),
                 protocol :: atom(),
                 host     :: rabbit:hostname(),
                 port     :: rabbit:ip_port()}).
@@ -77,7 +77,7 @@
                               -> 'ok').
 -spec(stop_tcp_listener/2 :: (rabbit:hostname(), rabbit:ip_port()) -> 'ok').
 -spec(active_listeners/0 :: () -> [listener()]).
--spec(node_listeners/1 :: (rabbit:erlang_node()) -> [listener()]).
+-spec(node_listeners/1 :: (node()) -> [listener()]).
 -spec(connections/0 :: () -> [connection()]).
 -spec(connection_info_keys/0 :: () -> [rabbit:info_key()]).
 -spec(connection_info/1 :: (connection()) -> [rabbit:info()]).
@@ -85,7 +85,7 @@
 -spec(connection_info_all/0 :: () -> [[rabbit:info()]]).
 -spec(connection_info_all/1 :: ([rabbit:info_key()]) -> [[rabbit:info()]]).
 -spec(close_connection/2 :: (pid(), string()) -> 'ok').
--spec(on_node_down/1 :: (rabbit:erlang_node()) -> 'ok').
+-spec(on_node_down/1 :: (node()) -> 'ok').
 -spec(check_tcp_listener_address/3 :: (atom(), rabbit:hostname(), rabbit:ip_port()) ->
              {inet:ip_address(), atom()}).