From 6ee18b6104ec2ea8d21ed8545331383842fba5ac Mon Sep 17 00:00:00 2001
From: k32 <10274441+k32@users.noreply.github.com>
Date: Mon, 27 Dec 2021 23:03:15 +0100
Subject: [PATCH] refactor(broker): Don't use a macro

---
 apps/emqx/rebar.config     |  2 +-
 apps/emqx/src/emqx_rpc.erl | 14 ++++++--------
 mix.exs                    |  2 +-
 rebar.config               |  2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config
index f573ddc87..4ec68d585 100644
--- a/apps/emqx/rebar.config
+++ b/apps/emqx/rebar.config
@@ -16,7 +16,7 @@
     , {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.0"}}}
     , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.0"}}}
     , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.11.2"}}}
-    , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.5.1"}}}
+    , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.0"}}}
     , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.22.2"}}}
     , {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}}
     , {recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}}
diff --git a/apps/emqx/src/emqx_rpc.erl b/apps/emqx/src/emqx_rpc.erl
index 527123745..0ea2814b0 100644
--- a/apps/emqx/src/emqx_rpc.erl
+++ b/apps/emqx/src/emqx_rpc.erl
@@ -30,27 +30,25 @@
           , rpc_nodes/1
           ]}).
 
--define(RPC, gen_rpc).
-
 -define(DefaultClientNum, 1).
 
 call(Node, Mod, Fun, Args) ->
-    filter_result(?RPC:call(rpc_node(Node), Mod, Fun, Args)).
+    filter_result(gen_rpc:call(rpc_node(Node), Mod, Fun, Args)).
 
 call(Key, Node, Mod, Fun, Args) ->
-    filter_result(?RPC:call(rpc_node({Key, Node}), Mod, Fun, Args)).
+    filter_result(gen_rpc:call(rpc_node({Key, Node}), Mod, Fun, Args)).
 
 multicall(Nodes, Mod, Fun, Args) ->
-    filter_result(?RPC:multicall(rpc_nodes(Nodes), Mod, Fun, Args)).
+    filter_result(gen_rpc:multicall(rpc_nodes(Nodes), Mod, Fun, Args)).
 
 multicall(Key, Nodes, Mod, Fun, Args) ->
-    filter_result(?RPC:multicall(rpc_nodes([{Key, Node} || Node <- Nodes]), Mod, Fun, Args)).
+    filter_result(gen_rpc:multicall(rpc_nodes([{Key, Node} || Node <- Nodes]), Mod, Fun, Args)).
 
 cast(Node, Mod, Fun, Args) ->
-    filter_result(?RPC:cast(rpc_node(Node), Mod, Fun, Args)).
+    filter_result(gen_rpc:cast(rpc_node(Node), Mod, Fun, Args)).
 
 cast(Key, Node, Mod, Fun, Args) ->
-    filter_result(?RPC:cast(rpc_node({Key, Node}), Mod, Fun, Args)).
+    filter_result(gen_rpc:cast(rpc_node({Key, Node}), Mod, Fun, Args)).
 
 rpc_node(Node) when is_atom(Node) ->
     {Node, rand:uniform(max_client_num())};
diff --git a/mix.exs b/mix.exs
index b4b9ef701..ca66f0c6d 100644
--- a/mix.exs
+++ b/mix.exs
@@ -54,7 +54,7 @@ defmodule EMQXUmbrella.MixProject do
       {:esockd, github: "emqx/esockd", tag: "5.9.0", override: true},
       {:mria, github: "emqx/mria", tag: "0.1.5", override: true},
       {:ekka, github: "emqx/ekka", tag: "0.11.2", override: true},
-      {:gen_rpc, github: "emqx/gen_rpc", tag: "2.5.1", override: true},
+      {:gen_rpc, github: "emqx/gen_rpc", tag: "2.8.0", override: true},
       {:minirest, github: "emqx/minirest", tag: "1.2.9", override: true},
       {:ecpool, github: "emqx/ecpool", tag: "0.5.2"},
       {:replayq, "0.3.3", override: true},
diff --git a/rebar.config b/rebar.config
index 17d4a0ce3..49e37e4af 100644
--- a/rebar.config
+++ b/rebar.config
@@ -55,7 +55,7 @@
     , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.0"}}}
     , {mria, {git, "https://github.com/emqx/mria", {tag, "0.1.5"}}}
     , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.11.2"}}}
-    , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.5.1"}}}
+    , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.0"}}}
     , {minirest, {git, "https://github.com/emqx/minirest", {tag, "1.2.9"}}}
     , {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.2"}}}
     , {replayq, "0.3.3"}