remove non-instant invocation

6 files changed, 23 insertions, 34 deletions

diff --git a/fnet/src/tests/frt/method_pt/method_pt.cpp b/fnet/src/tests/frt/method_pt/method_pt.cpp
index db5905d6871..5417fddceeb 100644
--- a/fnet/src/tests/frt/method_pt/method_pt.cpp
+++ b/fnet/src/tests/frt/method_pt/method_pt.cpp
@@ -207,35 +207,35 @@ void initTest() {
 
   //-------------------------------------------------------------------
 
-  rb.DefineMethod("simpleMethod", "", "", true,
+  rb.DefineMethod("simpleMethod", "", "",
                   FRT_METHOD(SimpleHandler::RPC_Method),
                   _simpleHandler);
 
   //-------------------------------------------------------------------
 
-  rb.DefineMethod("mediumMethod1", "", "", true,
+  rb.DefineMethod("mediumMethod1", "", "",
                   FRT_METHOD(MediumHandler1::RPC_Method),
                   _mediumHandler1);
 
-  rb.DefineMethod("mediumMethod2", "", "", true,
+  rb.DefineMethod("mediumMethod2", "", "",
                   FRT_METHOD(MediumHandler2::RPC_Method),
                   _mediumHandler2);
 
-  rb.DefineMethod("mediumMethod3", "", "", true,
+  rb.DefineMethod("mediumMethod3", "", "",
                   FRT_METHOD(MediumHandler3::RPC_Method),
                   _mediumHandler3);
 
   //-------------------------------------------------------------------
 
-  rb.DefineMethod("complexMethod1", "", "", true,
+  rb.DefineMethod("complexMethod1", "", "",
                   FRT_METHOD(ComplexHandler1::RPC_Method),
                   _complexHandler1);
 
-  rb.DefineMethod("complexMethod2", "", "", true,
+  rb.DefineMethod("complexMethod2", "", "",
                   FRT_METHOD(ComplexHandler2::RPC_Method),
                   _complexHandler2);
 
-  rb.DefineMethod("complexMethod3", "", "", true,
+  rb.DefineMethod("complexMethod3", "", "",
                   FRT_METHOD(ComplexHandler3::RPC_Method),
                   _complexHandler3);
 
diff --git a/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp b/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp
index 4f8b4b82743..dbead4adfe5 100644
--- a/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp
+++ b/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp
@@ -37,7 +37,7 @@ struct Server : Rpc {
     }
     void init_rpc() {
         FRT_ReflectionBuilder rb(&orb);
-        rb.DefineMethod("inc", "l", "l", true, FRT_METHOD(Server::rpc_inc), this);
+        rb.DefineMethod("inc", "l", "l", FRT_METHOD(Server::rpc_inc), this);
         rb.MethodDesc("increment a 64-bit integer");
         rb.ParamDesc("in", "an integer (64 bit)");
         rb.ReturnDesc("out", "in + 1 (64 bit)");
diff --git a/fnet/src/tests/frt/rpc/detach_return_invoke.cpp b/fnet/src/tests/frt/rpc/detach_return_invoke.cpp
index 54a891261c2..ab21c62bb68 100644
--- a/fnet/src/tests/frt/rpc/detach_return_invoke.cpp
+++ b/fnet/src/tests/frt/rpc/detach_return_invoke.cpp
@@ -20,7 +20,7 @@ struct Server : public FRT_Invokable
 
     Server(FRT_Supervisor &s, Receptor &r) : orb(s), receptor(r) {
         FRT_ReflectionBuilder rb(&s);
-        rb.DefineMethod("hook", "", "", true,
+        rb.DefineMethod("hook", "", "",
                         FRT_METHOD(Server::rpc_hook), this);
     }
 
diff --git a/fnet/src/tests/frt/rpc/invoke.cpp b/fnet/src/tests/frt/rpc/invoke.cpp
index 787adb227f9..e3bd662214f 100644
--- a/fnet/src/tests/frt/rpc/invoke.cpp
+++ b/fnet/src/tests/frt/rpc/invoke.cpp
@@ -124,7 +124,7 @@ public:
         assert(_echo_stash != nullptr && _echo_args != nullptr);
 
         FRT_ReflectionBuilder rb(supervisor);
-        rb.DefineMethod("echo", "*", "*", true,
+        rb.DefineMethod("echo", "*", "*",
                         FRT_METHOD(EchoTest::RPC_Echo), this);
 
         FRT_Values *args = _echo_args;
@@ -225,17 +225,15 @@ public:
     {
         FRT_ReflectionBuilder rb(supervisor);
 
-        rb.DefineMethod("inc", "i", "i", true,
+        rb.DefineMethod("inc", "i", "i",
                         FRT_METHOD(TestRPC::RPC_Inc), this);
-        rb.DefineMethod("setValue", "i", "", true,
+        rb.DefineMethod("setValue", "i", "",
                         FRT_METHOD(TestRPC::RPC_SetValue), this);
-        rb.DefineMethod("incValue", "", "", true,
+        rb.DefineMethod("incValue", "", "",
                         FRT_METHOD(TestRPC::RPC_IncValue), this);
-        rb.DefineMethod("getValue", "", "i", true,
+        rb.DefineMethod("getValue", "", "i",
                         FRT_METHOD(TestRPC::RPC_GetValue), this);
-        rb.DefineMethod("testFast", "iiibb", "i", true,
-                        FRT_METHOD(TestRPC::RPC_Test), this);
-        rb.DefineMethod("testSlow", "iiibb", "i", false,
+        rb.DefineMethod("testFast", "iiibb", "i",
                         FRT_METHOD(TestRPC::RPC_Test), this);
     }
 
@@ -364,7 +362,6 @@ const char phase_names[PHASE_ZZZ][32] =
 enum {
     TIMING_NULL = 0,
     TIMING_INSTANT,
-    TIMING_NON_INSTANT,
     TIMING_ZZZ
 };
 
@@ -372,7 +369,6 @@ const char timing_names[TIMING_ZZZ][32] =
 {
     "nullptr",
     "INSTANT",
-    "NON-INSTANT"
 };
 
 enum {
@@ -451,17 +447,10 @@ struct State {
     void PrepareTestMethod()
     {
         NewReq();
-        bool instant = (_timing == TIMING_INSTANT);
-        if (_timing != TIMING_INSTANT &&
-            _timing != TIMING_NON_INSTANT)
-        {
+        if (_timing != TIMING_INSTANT) {
             ASSERT_TRUE(false); // consult your dealer...
         }
-        if (instant) {
-            _req->SetMethodName("testFast");
-        } else {
-            _req->SetMethodName("testSlow");
-        }
+        _req->SetMethodName("testFast");
     }
 
     void SetTestParams(uint32_t value, uint32_t delay,
@@ -928,9 +917,9 @@ TEST_F("invoke test", State()) {
     EXPECT_TRUE(_phase_simple_cnt == 1);
     EXPECT_TRUE(_phase_void_cnt == 1);
     EXPECT_TRUE(_phase_speed_cnt == 1);
-    EXPECT_TRUE(_phase_advanced_cnt == 4);
-    EXPECT_TRUE(_phase_error_cnt == 4);
-    EXPECT_TRUE(_phase_abort_cnt == 4);
+    EXPECT_TRUE(_phase_advanced_cnt == 2);
+    EXPECT_TRUE(_phase_error_cnt == 2);
+    EXPECT_TRUE(_phase_abort_cnt == 2);
     EXPECT_TRUE(_phase_echo_cnt == 1);
 }
 
diff --git a/fnet/src/tests/frt/rpc/session.cpp b/fnet/src/tests/frt/rpc/session.cpp
index b84db9b4e88..93f14647e21 100644
--- a/fnet/src/tests/frt/rpc/session.cpp
+++ b/fnet/src/tests/frt/rpc/session.cpp
@@ -77,9 +77,9 @@ struct RPC : public FRT_Invokable
   void Init(FRT_Supervisor *s)
   {
     FRT_ReflectionBuilder rb(s);
-    rb.DefineMethod("getValue", "", "i", true,
+    rb.DefineMethod("getValue", "", "i",
                     FRT_METHOD(RPC::GetValue), this);
-    rb.DefineMethod("setValue", "i", "", true,
+    rb.DefineMethod("setValue", "i", "",
                     FRT_METHOD(RPC::SetValue), this);
     s->SetSessionInitHook(FRT_METHOD(RPC::InitSession), this);
     s->SetSessionFiniHook(FRT_METHOD(RPC::FiniSession), this);
diff --git a/fnet/src/tests/frt/rpc/sharedblob.cpp b/fnet/src/tests/frt/rpc/sharedblob.cpp
index 10eaad9c013..a48ecbb1da7 100644
--- a/fnet/src/tests/frt/rpc/sharedblob.cpp
+++ b/fnet/src/tests/frt/rpc/sharedblob.cpp
@@ -176,7 +176,7 @@ TEST("testImplicitShared") {
     ServerSampler serverSampler(dataSet, req);
     {
         FRT_ReflectionBuilder rb(&orb);
-        rb.DefineMethod("test", "*", "*", true,
+        rb.DefineMethod("test", "*", "*",
                         FRT_METHOD(ServerSampler::RPC_test), &serverSampler);
     }
     orb.Listen(0);