API change

deps/rabbitmq_federation/src/rabbit_federation_exchange.erl

@@ -94,8 +94,8 @@ federate(#exchange{internal = true}) ->
 
 federate(X) ->
     case rabbit_federation_upstream:set_for(X) of
-        {ok, _}    -> true;
-        {error, _} -> false
+        undefined -> false;
+        _         -> true
     end.
 
 maybe_start(X = #exchange{name = XName})->

deps/rabbitmq_federation/src/rabbit_federation_link_sup.erl

@@ -60,9 +60,9 @@ adjust(Sup, X = #exchange{name = XName}, {clear_upstream, UpstreamName}) ->
 %% TODO handle changes of upstream sets minimally (bug 24853)
 adjust(Sup, X = #exchange{name = XName}, {upstream_set, Set}) ->
     case rabbit_federation_upstream:set_for(X) of
-        {ok, Set} -> ok = rabbit_federation_db:prune_scratch(
-                            XName, rabbit_federation_upstream:for(X));
-        _         -> ok
+        undefined -> ok;
+        Set       -> ok = rabbit_federation_db:prune_scratch(
+                            XName, rabbit_federation_upstream:for(X))
     end,
     adjust(Sup, X, everything);
 adjust(Sup, X, {clear_upstream_set, _}) ->

deps/rabbitmq_federation/src/rabbit_federation_upstream.erl

@@ -33,14 +33,14 @@ set_for(X) -> rabbit_policy:get(<<"federation-upstream-set">>, X).
 
 for(X) ->
     case set_for(X) of
-        {ok, UpstreamSet}  -> from_set(UpstreamSet, X);
-        {error, not_found} -> []
+        undefined   -> [];
+        UpstreamSet -> from_set(UpstreamSet, X)
     end.
 
 for(X, UpstreamName) ->
     case set_for(X) of
-        {ok, UpstreamSet}  -> from_set(UpstreamSet, X, UpstreamName);
-        {error, not_found} -> []
+        undefined   -> [];
+        UpstreamSet -> from_set(UpstreamSet, X, UpstreamName)
     end.
 
 params_to_table(#upstream_params{uri          = URI,

deps/rabbitmq_federation/test/src/rabbit_federation_test.erl

@@ -684,12 +684,10 @@ assert_link_status({DXNameBin, ConnectionName, UXNameBin}, Status) ->
 
 links(#'exchange.declare'{exchange = Name}) ->
     case rabbit_policy:get(<<"federation-upstream-set">>, r(Name)) of
-        {ok, Set} ->
-            X = #exchange{name = r(Name)},
-            [{Name, U#upstream.name, U#upstream.exchange_name} ||
-                U <- rabbit_federation_upstream:from_set(Set, X)];
-        {error, not_found} ->
-            []
+        undefined -> [];
+        Set       -> X = #exchange{name = r(Name)},
+                     [{Name, U#upstream.name, U#upstream.exchange_name} ||
+                         U <- rabbit_federation_upstream:from_set(Set, X)]
     end.
 
 assert_connections(Xs, Conns) ->