get_rpc_handler should return UserRpcFrontend (#908)

samples/apps/smallbank/app/smallbank.cpp

@@ -382,7 +382,7 @@ namespace ccfapp
     }
   };
 
-  std::shared_ptr<enclave::RpcHandler> get_rpc_handler(
+  std::shared_ptr<ccf::UserRpcFrontend> get_rpc_handler(
     NetworkTables& nwt, AbstractNotifier& notifier)
   {
     return make_shared<SmallBank>(*nwt.tables);

src/apps/jsgeneric/jsgeneric.cpp

@@ -240,7 +240,7 @@ namespace ccfapp
     {}
   };
 
-  std::shared_ptr<enclave::RpcHandler> get_rpc_handler(
+  std::shared_ptr<ccf::UserRpcFrontend> get_rpc_handler(
     NetworkTables& network, AbstractNotifier& notifier)
   {
     return make_shared<JS>(network);

src/apps/logging/logging.cpp

@@ -278,7 +278,7 @@ namespace ccfapp
   };
 
   // SNIPPET_START: rpc_handler
-  std::shared_ptr<enclave::RpcHandler> get_rpc_handler(
+  std::shared_ptr<ccf::UserRpcFrontend> get_rpc_handler(
     NetworkTables& nwt, AbstractNotifier& notifier)
   {
     return make_shared<Logger>(nwt, notifier);

src/apps/luageneric/luageneric.cpp

@@ -222,7 +222,7 @@ namespace ccfapp
     {}
   };
 
-  std::shared_ptr<enclave::RpcHandler> get_rpc_handler(
+  std::shared_ptr<ccf::UserRpcFrontend> get_rpc_handler(
     NetworkTables& network, AbstractNotifier& notifier)
   {
     return std::make_shared<Lua>(network);

src/enclave/appinterface.h

@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the Apache 2.0 License.
 #pragma once
-#include "enclave/rpchandler.h"
-#include "node/networktables.h"
-#include "node/rpc/nodeinterface.h"
+
+#include "node/rpc/userfrontend.h"
 
 namespace ccfapp
 {
@@ -17,7 +16,7 @@ namespace ccfapp
    *
    * @see `ccf::RpcFrontend`
    */
-  std::shared_ptr<enclave::RpcHandler> get_rpc_handler(
+  std::shared_ptr<ccf::UserRpcFrontend> get_rpc_handler(
     ccf::NetworkTables& network, ccf::AbstractNotifier& notifier);
   // SNIPPET_END: rpc_handler
 }

src/node/rpc/frontend.h

@@ -2,6 +2,8 @@
 // Licensed under the Apache 2.0 License.
 #pragma once
 #include "commonhandlerregistry.h"
+#include "consensus/pbft/pbftrequests.h"
+#include "consensus/pbft/pbfttables.h"
 #include "consts.h"
 #include "ds/buffer.h"
 #include "ds/spinlock.h"

src/node/rpc/userfrontend.h

@@ -4,6 +4,7 @@
 
 #include "frontend.h"
 #include "node/clientsignatures.h"
+#include "node/networktables.h"
 
 namespace ccf
 {