Make plugin compatible with 3.12

due to rabbitmq/rabbitmq-server#682

Author: ansd

README.md

@@ -31,11 +31,11 @@ of some kind.
 
 ## Supported RabbitMQ Versions
 
-The most recent release of this plugin targets RabbitMQ 3.11.x.
+The most recent release of this plugin targets RabbitMQ 3.12.x.
 
 ## Supported Erlang/OTP Versions
 
-This plugin [requires Erlang 23.2 or later versions](https://www.rabbitmq.com/which-erlang.html), same as RabbitMQ 3.8.16+.
+The latest version of this plugin [requires Erlang 25.0 or later versions](https://www.rabbitmq.com/which-erlang.html), same as RabbitMQ 3.12.x.
 
 ## Project Maturity
 

src/rabbit_delayed_message.erl

@@ -171,7 +171,7 @@ route(#delay_key{exchange = Ex}, Deliveries, State) ->
     lists:map(fun (#delay_entry{delivery = D}) ->
                       D2 = swap_delay_header(D),
                       Dests = rabbit_exchange:route(Ex, D2),
-                      Qs = rabbit_amqqueue:lookup(Dests),
+                      Qs = rabbit_amqqueue:lookup_many(Dests),
                       rabbit_amqqueue:deliver(Qs, D2),
                       bump_routed_stats(ExName, Qs, State)
               end, Deliveries).

src/rabbit_exchange_type_delayed_message.erl

@@ -27,7 +27,7 @@
 
 -export([description/0, serialise_events/0, route/2]).
 -export([validate/1, validate_binding/2,
-         create/2, delete/3, policy_changed/2,
+         create/2, delete/2, policy_changed/2,
          add_binding/3, remove_bindings/3, assert_args_equivalence/2]).
 -export([info/1, info/2]).
 
@@ -80,16 +80,16 @@ validate(#exchange{arguments = Args} = X) ->
 
 validate_binding(X, B) ->
     ?EXCHANGE(X):validate_binding(X, B).
-create(Tx, X) ->
-    ?EXCHANGE(X):create(Tx, X).
-delete(Tx, X, Bs) ->
-    ?EXCHANGE(X):delete(Tx, X, Bs).
+create(Serial, X) ->
+    ?EXCHANGE(X):create(Serial, X).
+delete(Serial, X) ->
+    ?EXCHANGE(X):delete(Serial, X).
 policy_changed(X1, X2) ->
     ?EXCHANGE(X1):policy_changed(X1, X2).
-add_binding(Tx, X, B) ->
-    ?EXCHANGE(X):add_binding(Tx, X, B).
-remove_bindings(Tx, X, Bs) ->
-    ?EXCHANGE(X):remove_bindings(Tx, X, Bs).
+add_binding(Serial, X, B) ->
+    ?EXCHANGE(X):add_binding(Serial, X, B).
+remove_bindings(Serial, X, Bs) ->
+    ?EXCHANGE(X):remove_bindings(Serial, X, Bs).
 assert_args_equivalence(X, Args) ->
     ?EXCHANGE(X):assert_args_equivalence(X, Args).
 serialise_events() -> false.