Cosmetics / specs.

7 files changed, 9 insertions, 13 deletions

diff --git a/src/rabbit.erl b/src/rabbit.erl
index 2840a5b7..07316138 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -460,9 +460,7 @@ boot_delegate() ->
     rabbit_sup:start_child(delegate_sup, [Count]).
 
 recover() ->
-    XNames = rabbit_exchange:recover(),
-    QNames = rabbit_amqqueue:recover(),
-    rabbit_binding:recover(XNames, QNames).
+    rabbit_binding:recover(rabbit_exchange:recover(), rabbit_amqqueue:start()).
 
 maybe_insert_default_data() ->
     case rabbit_mnesia:is_db_empty() of
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index 34ed88bc..e813d75c 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -16,7 +16,7 @@
 
 -module(rabbit_amqqueue).
 
--export([recover/0, stop/0, declare/5, delete_immediately/1, delete/3,
+-export([start/0, stop/0, declare/5, delete_immediately/1, delete/3,
          purge/1]).
 -export([pseudo_queue/2]).
 -export([lookup/1, with/2, with_or_die/2, assert_equivalence/5,
@@ -58,7 +58,7 @@
 
 -type(queue_or_not_found() :: rabbit_types:amqqueue() | 'not_found').
 
--spec(recover/0 :: () -> [rabbit_types:amqqueue()]).
+-spec(start/0 :: () -> [rabbit_amqqueue:name()]).
 -spec(stop/0 :: () -> 'ok').
 -spec(declare/5 ::
         (name(), boolean(), boolean(),
@@ -158,7 +158,7 @@
 
 %%----------------------------------------------------------------------------
 
-recover() ->
+start() ->
     DurableQueues = find_durable_queues(),
     {ok, BQ} = application:get_env(rabbit, backing_queue_module),
     ok = BQ:start([QName || #amqqueue{name = QName} <- DurableQueues]),
diff --git a/src/rabbit_binding.erl b/src/rabbit_binding.erl
index 5ac9c871..5f120547 100644
--- a/src/rabbit_binding.erl
+++ b/src/rabbit_binding.erl
@@ -50,7 +50,7 @@
 
 -opaque(deletions() :: dict()).
 
--spec(recover/2 :: ([rabbit_types:resource()], [rabbit_types:resource()]) ->
+-spec(recover/2 :: ([rabbit_exchange:name()], [rabbit_amqqueue:name()]) ->
                         'ok').
 -spec(exists/1 :: (rabbit_types:binding()) -> boolean() | bind_errors()).
 -spec(add/1 :: (rabbit_types:binding()) -> add_res()).
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl
index 7268b15d..86ce69ef 100644
--- a/src/rabbit_exchange.erl
+++ b/src/rabbit_exchange.erl
@@ -36,7 +36,7 @@
 -type(type() :: atom()).
 -type(fun_name() :: atom()).
 
--spec(recover/0 :: () -> [rabbit_types:resource()]).
+-spec(recover/0 :: () -> [rabbit_exchange:name()]).
 -spec(callback/3:: (rabbit_types:exchange(), fun_name(), [any()]) -> 'ok').
 -spec(declare/6 ::
         (name(), type(), boolean(), boolean(), boolean(),
diff --git a/src/rabbit_exchange_type_direct.erl b/src/rabbit_exchange_type_direct.erl
index 200c2997..4c56a1f8 100644
--- a/src/rabbit_exchange_type_direct.erl
+++ b/src/rabbit_exchange_type_direct.erl
@@ -42,7 +42,7 @@ route(#exchange{name = Name},
 validate(_X) -> ok.
 create(_Tx, _X) -> ok.
 delete(_Tx, _X, _Bs) -> ok.
-add_bindings(_Tx, _X, _B) -> ok.
+add_bindings(_Tx, _X, _Bs) -> ok.
 remove_bindings(_Tx, _X, _Bs) -> ok.
 assert_args_equivalence(X, Args) ->
     rabbit_exchange:assert_args_equivalence(X, Args).
diff --git a/src/rabbit_exchange_type_topic.erl b/src/rabbit_exchange_type_topic.erl
index efa5fb52..2c995df8 100644
--- a/src/rabbit_exchange_type_topic.erl
+++ b/src/rabbit_exchange_type_topic.erl
@@ -47,9 +47,7 @@ route(#exchange{name = X},
                   end || RKey <- Routes]).
 
 validate(_X) -> ok.
-
-create(_Tx, _X) ->
-    ok.
+create(_Tx, _X) -> ok.
 
 delete(true, #exchange{name = X}, _Bs) ->
     trie_remove_all_edges(X),
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 995b84d9..e618156b 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -2322,7 +2322,7 @@ test_queue_recover() ->
     after 10000 -> exit(timeout_waiting_for_queue_death)
     end,
     rabbit_amqqueue:stop(),
-    rabbit_amqqueue:recover(),
+    rabbit_amqqueue:start(),
     rabbit_amqqueue:with_or_die(
       QName,
       fun (Q1 = #amqqueue { pid = QPid1 }) ->