rename ppc-main to wedpr-main

WeBankBlockchain · Sep 4, 2024 · 905ac0f · 905ac0f
1 parent 0fba05a
commit 905ac0f
Show file tree

Hide file tree

Showing 25 changed files with 14 additions and 10 deletions.
diff --git a/cpp/libinitializer/CMakeLists.txt → cpp/wedpr-initializer/CMakeLists.txt b/cpp/libinitializer/CMakeLists.txt → cpp/wedpr-initializer/CMakeLists.txt
diff --git a/cpp/libinitializer/Common.h → cpp/wedpr-initializer/Common.h b/cpp/libinitializer/Common.h → cpp/wedpr-initializer/Common.h
diff --git a/cpp/libinitializer/FrontInitializer.cpp → cpp/wedpr-initializer/FrontInitializer.cpp b/cpp/libinitializer/FrontInitializer.cpp → cpp/wedpr-initializer/FrontInitializer.cpp
diff --git a/cpp/libinitializer/FrontInitializer.h → cpp/wedpr-initializer/FrontInitializer.h b/cpp/libinitializer/FrontInitializer.h → cpp/wedpr-initializer/FrontInitializer.h
diff --git a/cpp/libinitializer/Initializer.cpp → cpp/wedpr-initializer/Initializer.cpp b/cpp/libinitializer/Initializer.cpp → cpp/wedpr-initializer/Initializer.cpp
diff --git a/cpp/libinitializer/Initializer.h → cpp/wedpr-initializer/Initializer.h b/cpp/libinitializer/Initializer.h → cpp/wedpr-initializer/Initializer.h
diff --git a/cpp/libinitializer/ProFrontInitializer.h → cpp/wedpr-initializer/ProFrontInitializer.h b/cpp/libinitializer/ProFrontInitializer.h → cpp/wedpr-initializer/ProFrontInitializer.h
diff --git a/cpp/libinitializer/ProtocolInitializer.h → cpp/wedpr-initializer/ProtocolInitializer.h b/cpp/libinitializer/ProtocolInitializer.h → cpp/wedpr-initializer/ProtocolInitializer.h
diff --git a/cpp/ppc-main/CMakeLists.txt → cpp/wedpr-main/CMakeLists.txt b/cpp/ppc-main/CMakeLists.txt → cpp/wedpr-main/CMakeLists.txt
diff --git a/cpp/ppc-main/air-node/AirNodeInitializer.cpp → ...edpr-main/air-node/AirNodeInitializer.cpp b/cpp/ppc-main/air-node/AirNodeInitializer.cpp → ...edpr-main/air-node/AirNodeInitializer.cpp
@@ -18,7 +18,7 @@
  * @date 2022-11-14
  */
 #include "AirNodeInitializer.h"
-#include "ppc-gateway/Gateway.h"
+#include "ppc-gateway/GatewayFactory.h"
 #include "ppc-gateway/GatewayConfigContext.h"
 #include "ppc-rpc/src/RpcFactory.h"
 #include "ppc-rpc/src/RpcMemory.h"
@@ -50,15 +50,13 @@ void AirNodeInitializer::init(std::string const& _configPath)
 
     // init the gateway
     initGateway(_configPath);
-    // set the gateway into front
-    front->setGatewayInterface(m_gateway);
 
     INIT_LOG(INFO) << LOG_DESC("init the rpc");
     // load the rpc config
     // not specify the certPath in air-mode
     m_nodeInitializer->config()->loadRpcConfig(nullptr, pt);
     // init RpcStatusInterface
-    RpcStatusInterface::Ptr rpcStatusInterface = std::make_shared<ppc::rpc::RpcMemory>(m_gateway);
+    RpcStatusInterface::Ptr rpcStatusInterface = std::make_shared<ppc::rpc::RpcMemory>();
 
     m_nodeInitializer->frontInitializer()->setRpcStatus(rpcStatusInterface);
     auto rpcFactory = std::make_shared<RpcFactory>(m_nodeInitializer->config()->agencyID());
@@ -82,12 +80,16 @@ void AirNodeInitializer::initGateway(std::string const& _configPath)
     auto threadPool = std::make_shared<bcos::ThreadPool>(
         "gateway", config->gatewayConfig().networkConfig.threadPoolSize);
 
-    // Note: no need use redis as cache in-air-mode
-    GatewayFactory gatewayFactory;
-    auto gateway = gatewayFactory.buildGateway(ppc::protocol::NodeArch::AIR, config, nullptr,
+    GatewayFactory gatewayFactory(config);
+    m_gateway = gatewayFactory.build(m_frontBuilder);
+    // TODO: register the nodeInfo
+    //m_gateway->registerNodeInfo();
+    // ppc::front::IFrontBuilder::Ptr const& frontBuilder
+    // registerNodeInfo(ppc::protocol::INodeInfo::Ptr const& nodeInfo)
+    /*auto gateway = gatewayFactory.buildGateway(ppc::protocol::NodeArch::AIR, config, nullptr,
         m_nodeInitializer->protocolInitializer()->ppcMsgFactory(), threadPool);
     auto frontInitializer = m_nodeInitializer->frontInitializer();
-    gateway->registerFront(frontInitializer->front()->selfEndPoint(), frontInitializer->front());
+    gateway->registerFront(frontInitializer->front()->selfEndPoint(), frontInitializer->front());*/
     m_gateway = gateway;
 }
 

diff --git a/cpp/ppc-main/air-node/AirNodeInitializer.h → cpp/wedpr-main/air-node/AirNodeInitializer.h b/cpp/ppc-main/air-node/AirNodeInitializer.h → cpp/wedpr-main/air-node/AirNodeInitializer.h
@@ -20,7 +20,8 @@
 #pragma once
 #include "libinitializer/Common.h"
 #include "libinitializer/Initializer.h"
-#include "ppc-framework/gateway/GatewayInterface.h"
+#include "ppc-framework/front/IFront.h"
+#include "ppc-framework/gateway/IGateway.h"
 #include <bcos-utilities/BoostLogInitializer.h>
 #include <memory>
 namespace ppc::rpc
@@ -46,7 +47,8 @@ class AirNodeInitializer
 private:
     bcos::BoostLogInitializer::Ptr m_logInitializer;
     ppc::initializer::Initializer::Ptr m_nodeInitializer;
-    ppc::gateway::GatewayInterface::Ptr m_gateway;
+    ppc::gateway::IGateway::Ptr m_gateway;
     std::shared_ptr<ppc::rpc::Rpc> m_rpc;
+    ppc::front::IFrontBuilder::Ptr m_frontBuilder;
 };
 }  // namespace ppc::node
diff --git a/cpp/ppc-main/air-node/CMakeLists.txt → cpp/wedpr-main/air-node/CMakeLists.txt b/cpp/ppc-main/air-node/CMakeLists.txt → cpp/wedpr-main/air-node/CMakeLists.txt
diff --git a/cpp/ppc-main/air-node/main.cpp → cpp/wedpr-main/air-node/main.cpp b/cpp/ppc-main/air-node/main.cpp → cpp/wedpr-main/air-node/main.cpp
diff --git a/cpp/ppc-main/cem-node/CEMInitializer.cpp → cpp/wedpr-main/cem-node/CEMInitializer.cpp b/cpp/ppc-main/cem-node/CEMInitializer.cpp → cpp/wedpr-main/cem-node/CEMInitializer.cpp
diff --git a/cpp/ppc-main/cem-node/CEMInitializer.h → cpp/wedpr-main/cem-node/CEMInitializer.h b/cpp/ppc-main/cem-node/CEMInitializer.h → cpp/wedpr-main/cem-node/CEMInitializer.h
diff --git a/cpp/ppc-main/cem-node/CMakeLists.txt → cpp/wedpr-main/cem-node/CMakeLists.txt b/cpp/ppc-main/cem-node/CMakeLists.txt → cpp/wedpr-main/cem-node/CMakeLists.txt
diff --git a/cpp/ppc-main/cem-node/main.cpp → cpp/wedpr-main/cem-node/main.cpp b/cpp/ppc-main/cem-node/main.cpp → cpp/wedpr-main/cem-node/main.cpp
diff --git a/cpp/ppc-main/gateway/CMakeLists.txt → cpp/wedpr-main/gateway/CMakeLists.txt b/cpp/ppc-main/gateway/CMakeLists.txt → cpp/wedpr-main/gateway/CMakeLists.txt
diff --git a/cpp/ppc-main/gateway/main.cpp → cpp/wedpr-main/gateway/main.cpp b/cpp/ppc-main/gateway/main.cpp → cpp/wedpr-main/gateway/main.cpp
diff --git a/cpp/ppc-main/mpc-node/CMakeLists.txt → cpp/wedpr-main/mpc-node/CMakeLists.txt b/cpp/ppc-main/mpc-node/CMakeLists.txt → cpp/wedpr-main/mpc-node/CMakeLists.txt
diff --git a/cpp/ppc-main/mpc-node/MPCInitializer.cpp → cpp/wedpr-main/mpc-node/MPCInitializer.cpp b/cpp/ppc-main/mpc-node/MPCInitializer.cpp → cpp/wedpr-main/mpc-node/MPCInitializer.cpp
diff --git a/cpp/ppc-main/mpc-node/MPCInitializer.h → cpp/wedpr-main/mpc-node/MPCInitializer.h b/cpp/ppc-main/mpc-node/MPCInitializer.h → cpp/wedpr-main/mpc-node/MPCInitializer.h
diff --git a/cpp/ppc-main/mpc-node/main.cpp → cpp/wedpr-main/mpc-node/main.cpp b/cpp/ppc-main/mpc-node/main.cpp → cpp/wedpr-main/mpc-node/main.cpp
diff --git a/cpp/ppc-main/pro-node/CMakeLists.txt → cpp/wedpr-main/pro-node/CMakeLists.txt b/cpp/ppc-main/pro-node/CMakeLists.txt → cpp/wedpr-main/pro-node/CMakeLists.txt
diff --git a/cpp/ppc-main/pro-node/main.cpp → cpp/wedpr-main/pro-node/main.cpp b/cpp/ppc-main/pro-node/main.cpp → cpp/wedpr-main/pro-node/main.cpp