Remove the costly and unnecessary setSlobrokId interface.

6 files changed, 17 insertions, 21 deletions

diff --git a/messagebus_test/src/tests/error/cpp-client.cpp b/messagebus_test/src/tests/error/cpp-client.cpp
index 44580400e26..2a3376336ea 100644
--- a/messagebus_test/src/tests/error/cpp-client.cpp
+++ b/messagebus_test/src/tests/error/cpp-client.cpp
@@ -20,10 +20,9 @@ public:
 int
 App::Main()
 {
-    RPCMessageBus mb(ProtocolSet().add(IProtocol::SP(new SimpleProtocol())),
-                     RPCNetworkParams()
-                     .setIdentity(Identity("server/cpp"))
-                     .setSlobrokConfig("file:slobrok.cfg"),
+    RPCMessageBus mb(ProtocolSet().add(std::make_shared<SimpleProtocol>()),
+                     RPCNetworkParams("file:slobrok.cfg")
+                     .setIdentity(Identity("server/cpp")),
                      "file:routing.cfg");
 
     Receptor src;
diff --git a/messagebus_test/src/tests/error/cpp-server.cpp b/messagebus_test/src/tests/error/cpp-server.cpp
index af0d6e30132..d5200ed20c1 100644
--- a/messagebus_test/src/tests/error/cpp-server.cpp
+++ b/messagebus_test/src/tests/error/cpp-server.cpp
@@ -49,10 +49,9 @@ public:
 int
 App::Main()
 {
-    RPCMessageBus mb(ProtocolSet().add(IProtocol::SP(new SimpleProtocol())),
-                     RPCNetworkParams()
-                     .setIdentity(Identity("server/cpp"))
-                     .setSlobrokConfig("file:slobrok.cfg"),
+    RPCMessageBus mb(ProtocolSet().add(std::make_shared<SimpleProtocol>()),
+                     RPCNetworkParams("file:slobrok.cfg")
+                     .setIdentity(Identity("server/cpp")),
                      "file:routing.cfg");
     Server server(mb.getMessageBus());
     while (true) {
diff --git a/messagebus_test/src/tests/speed/cpp-client.cpp b/messagebus_test/src/tests/speed/cpp-client.cpp
index 437cc3ce354..8f65e919e97 100644
--- a/messagebus_test/src/tests/speed/cpp-client.cpp
+++ b/messagebus_test/src/tests/speed/cpp-client.cpp
@@ -90,10 +90,10 @@ public:
 int
 App::Main()
 {
-    RetryTransientErrorsPolicy::SP retryPolicy(new RetryTransientErrorsPolicy());
+    auto retryPolicy = std::make_shared<RetryTransientErrorsPolicy>();
     retryPolicy->setBaseDelay(0.1);
-    RPCMessageBus mb(MessageBusParams().setRetryPolicy(retryPolicy).addProtocol(IProtocol::SP(new SimpleProtocol())),
-                     RPCNetworkParams().setIdentity(Identity("server/cpp")).setSlobrokConfig("file:slobrok.cfg"),
+    RPCMessageBus mb(MessageBusParams().setRetryPolicy(retryPolicy).addProtocol(std::make_shared<SimpleProtocol>()),
+                     RPCNetworkParams("file:slobrok.cfg").setIdentity(Identity("server/cpp")),
                      "file:routing.cfg");
     Client client(mb.getMessageBus(), SourceSessionParams().setTimeout(30));
 
diff --git a/messagebus_test/src/tests/speed/cpp-server.cpp b/messagebus_test/src/tests/speed/cpp-server.cpp
index ddbeac62ce2..82b884c46f2 100644
--- a/messagebus_test/src/tests/speed/cpp-server.cpp
+++ b/messagebus_test/src/tests/speed/cpp-server.cpp
@@ -56,10 +56,9 @@ public:
 int
 App::Main()
 {
-    RPCMessageBus mb(ProtocolSet().add(IProtocol::SP(new SimpleProtocol())),
-                     RPCNetworkParams()
-                     .setIdentity(Identity("server/cpp"))
-                     .setSlobrokConfig("file:slobrok.cfg"),
+    RPCMessageBus mb(ProtocolSet().add(std::make_shared<SimpleProtocol>()),
+                     RPCNetworkParams("file:slobrok.cfg")
+                     .setIdentity(Identity("server/cpp")),
                      "file:routing.cfg");
     Server server(mb.getMessageBus());
     while (true) {
diff --git a/messagebus_test/src/tests/trace/cpp-server.cpp b/messagebus_test/src/tests/trace/cpp-server.cpp
index c9086ff1758..d6db86070b1 100644
--- a/messagebus_test/src/tests/trace/cpp-server.cpp
+++ b/messagebus_test/src/tests/trace/cpp-server.cpp
@@ -67,10 +67,9 @@ App::Main()
         fprintf(stderr, "usage: %s <service-prefix>\n", _argv[0]);
         return 1;
     }
-    RPCMessageBus mb(ProtocolSet().add(IProtocol::SP(new SimpleProtocol())),
-                     RPCNetworkParams()
-                     .setIdentity(Identity(_argv[1]))
-                     .setSlobrokConfig("file:slobrok.cfg"),
+    RPCMessageBus mb(ProtocolSet().add(std::make_shared<SimpleProtocol>()),
+                     RPCNetworkParams("file:slobrok.cfg")
+                     .setIdentity(Identity(_argv[1])),
                      "file:routing.cfg");
     Server server(mb.getMessageBus(), _argv[1]);
     while (true) {
diff --git a/messagebus_test/src/tests/trace/trace.cpp b/messagebus_test/src/tests/trace/trace.cpp
index a653c4934b3..a804bef6785 100644
--- a/messagebus_test/src/tests/trace/trace.cpp
+++ b/messagebus_test/src/tests/trace/trace.cpp
@@ -59,8 +59,8 @@ Test::Main()
     }
     
     EXPECT_TRUE(system((ctl_script + " start all").c_str()) == 0);
-    RPCMessageBus mb(ProtocolSet().add(IProtocol::SP(new SimpleProtocol())),
-                     RPCNetworkParams().setSlobrokConfig("file:slobrok.cfg"),
+    RPCMessageBus mb(ProtocolSet().add(std::make_shared<SimpleProtocol>()),
+                     RPCNetworkParams("file:slobrok.cfg"),
                      "file:routing.cfg");
     EXPECT_TRUE(waitSlobrok(mb, "server/cpp/1/A/session"));
     EXPECT_TRUE(waitSlobrok(mb, "server/cpp/2/A/session"));