fix ci (#87)

cyjseagull · web-flow · commit 154096843e9f · 2024-11-13T20:28:09.000+08:00
* add tests for grpc

* fix ci

* use fisco registry vcpkg
diff --git a/.github/workflows/cpp_full_node_workflow.yml b/.github/workflows/cpp_full_node_workflow.yml
@@ -74,6 +74,12 @@ jobs:
           bash -x cpp/tools/install_depends.sh -o macos
           mkdir -p cpp/build && cd cpp/build && cmake -DBUILD_STATIC=ON -DTESTS=ON -DCOVERAGE=ON -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake ../
           make -j3
+      - name: Publish Error
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: gperftools-build-err.log
+          path: /home/runner/work/WeDPR-Component/WeDPR-Component/cpp/deps/src/gperftools-stamp/gperftools-build-err.log
       - uses: actions/upload-artifact@v4
         if: runner.os == 'macOS'      
         with:
@@ -171,6 +177,9 @@ jobs:
           du -sch /usr/local/share/vcpkg/buildtrees/grpc/src/*
           rm -rf /usr/local/share/vcpkg/buildtrees/grpc/src
           rm -rf /usr/local/share/vcpkg/buildtrees/grpc/*-dbg
+          rm -rf /usr/local/share/vcpkg/buildtrees/openssl/src
+          rm -rf /usr/local/share/vcpkg/buildtrees/openssl/*-dbg
+          rm -rf /usr/local/share/vcpkg/buildtrees/*/*-dbg
           df -lh
       - name: Compile
         run: |   
diff --git a/cpp/cmake/python.cmake b/cpp/cmake/python.cmake
@@ -9,7 +9,8 @@ message("Python_Development_FOUND:${Python_Development_FOUND}")
 message("Python_LIBRARIES:${Python_LIBRARIES}")
 message("Python_INCLUDE_DIRS:${Python_INCLUDE_DIRS}")
 
-list(APPEND CMAKE_SWIG_FLAGS "-DPY3")
+list(APPEND CMAKE_SWIG_FLAGS "-D${Python_LIBRARIES}")
+message("## CMAKE_SWIG_FLAGS: ${CMAKE_SWIG_FLAGS}")
 
 function(search_python_module)
   set(options NO_VERSION)
diff --git a/cpp/test-utils/TaskMock.h b/cpp/test-utils/TaskMock.h
@@ -19,10 +19,8 @@
  */
 #pragma once
 #include "ppc-framework/protocol/Task.h"
-#include "ppc-io/src/FileLineReader.h"
 #include <boost/test/unit_test.hpp>
 
-using namespace ppc::io;
 using namespace ppc::protocol;
 namespace ppc::test
 {
@@ -91,4 +89,4 @@ inline void checkTask(Task::Ptr _task1, Task::Ptr _task2)
         checkParty(it.second, _task2->getPartyByID(it.first));
     }
 }
-}  // namespace ppc::test
+}  // namespace ppc::test
diff --git a/cpp/tools/install_depends.sh b/cpp/tools/install_depends.sh
@@ -111,11 +111,24 @@ install_ubuntu_depends()
     LOG_INFO "install depends for ubuntu success ..."
 }
 
+install_iconv_depend()
+{
+    LOG_INFO "download and install libiconv..."
+    wget --no-check-certificate https://mirrors.tuna.tsinghua.edu.cn/gnu/libiconv/libiconv-1.16.tar.gz && tar -xvf libiconv-1.16.tar.gz
+    
+    cd libiconv-1.16 && ./configure --with-pic && make -j4 && make install
+    cd .. && rm -rf libiconv-1.16*
+    df -lh
+    LOG_INFO "download and install libiconv success..."
+}
+
 install_macos_depends()
 {
     LOG_INFO "install depends for macos ..."
     brew install autoconf nasm lcov
+    brew link libiconv
     install_gsasl_depend "macos"
+    install_iconv_depend
     LOG_INFO "install depends for macos success ..."
 }
 
diff --git a/cpp/vcpkg-configuration.json b/cpp/vcpkg-configuration.json
@@ -9,7 +9,8 @@
         "bcos-utilities",
         "bcos-boostssl",
         "tarscpp",
-        "libhdfs3"
+        "libhdfs3",
+        "tbb"
       ]
     }
   ]
diff --git a/cpp/vcpkg.json b/cpp/vcpkg.json
@@ -118,7 +118,8 @@
         },
         "tarscpp",
         "tbb",
-        "libxml2"
+        "libxml2",
+        "libiconv"
       ]
     },
     "sdk": {
diff --git a/cpp/wedpr-computing/ppc-psi/tests/bs-ecdh-psi/TestBsEcdhCache.cpp b/cpp/wedpr-computing/ppc-psi/tests/bs-ecdh-psi/TestBsEcdhCache.cpp
@@ -19,6 +19,7 @@
  */
 
 #include "ppc-io/src/DataResourceLoaderImpl.h"
+#include "ppc-io/src/FileLineReader.h"
 #include "ppc-psi/src/bs-ecdh-psi/BsEcdhPSIFactory.h"
 #include "ppc-psi/src/bs-ecdh-psi/core/BsEcdhCache.h"
 #include "test-utils/FakeFront.h"
diff --git a/cpp/wedpr-computing/ppc-psi/tests/cm2020-psi/FakeCM2020PSIFactory.h b/cpp/wedpr-computing/ppc-psi/tests/cm2020-psi/FakeCM2020PSIFactory.h
@@ -18,11 +18,11 @@
  * @date 2022-12-19
  */
 #pragma once
-
 #include "ppc-crypto-core/src/hash/BLAKE2bHash.h"
 #include "ppc-crypto/src/ecc/Ed25519EccCrypto.h"
 #include "ppc-framework/crypto/CryptoBox.h"
 #include "ppc-io/src/DataResourceLoaderImpl.h"
+#include "ppc-io/src/FileLineReader.h"
 #include "ppc-tools/src/config/PPCConfig.h"
 #include "test-utils/FakeFront.h"
 #include <ppc-psi/src/cm2020-psi/CM2020PSIFactory.h>
diff --git a/cpp/wedpr-computing/ppc-psi/tests/cm2020-psi/TestCM2020Impl.cpp b/cpp/wedpr-computing/ppc-psi/tests/cm2020-psi/TestCM2020Impl.cpp
@@ -19,6 +19,7 @@
  */
 
 #include "FakeCM2020PSIFactory.h"
+#include "ppc-io/src/FileLineReader.h"
 #include "ppc-psi/src/cm2020-psi/CM2020PSIImpl.h"
 #include "protocol/src/JsonTaskImpl.h"
 #include "test-utils/FakeFront.h"
@@ -29,6 +30,7 @@
 #include <boost/test/unit_test.hpp>
 
 using namespace ppc::psi;
+using namespace ppc::io;
 using namespace bcos;
 using namespace bcos::test;
 using namespace ppc::crypto;
diff --git a/cpp/wedpr-computing/ppc-psi/tests/labeled-psi/FakeLabeledPSIFactory.h b/cpp/wedpr-computing/ppc-psi/tests/labeled-psi/FakeLabeledPSIFactory.h
@@ -23,10 +23,10 @@
 #include "ppc-crypto/src/ecc/Ed25519EccCrypto.h"
 #include "ppc-framework/crypto/CryptoBox.h"
 #include "ppc-io/src/DataResourceLoaderImpl.h"
+#include "ppc-io/src/FileLineReader.h"
 #include "ppc-tools/src/config/PPCConfig.h"
 #include "test-utils/FakeFront.h"
 #include <ppc-psi/src/labeled-psi/LabeledPSIFactory.h>
-
 using namespace bcos;
 using namespace ppc::protocol;
 using namespace ppc::psi;
diff --git a/cpp/wedpr-computing/ppc-psi/tests/labeled-psi/TestLabeledPSIImpl.cpp b/cpp/wedpr-computing/ppc-psi/tests/labeled-psi/TestLabeledPSIImpl.cpp
@@ -19,6 +19,7 @@
  */
 
 #include "FakeLabeledPSIFactory.h"
+#include "ppc-io/src/FileLineReader.h"
 #include "ppc-psi/src/labeled-psi/LabeledPSIImpl.h"
 #include "ppc-psi/src/labeled-psi/protocol/LabeledPSIResult.h"
 #include "protocol/src/JsonTaskImpl.h"
@@ -27,7 +28,6 @@
 #include <bcos-utilities/testutils/TestPromptFixture.h>
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
-
 using namespace ppc::psi;
 using namespace bcos;
 using namespace bcos::test;
diff --git a/cpp/wedpr-computing/ppc-psi/tests/labeled-psi/TestSenderDB.cpp b/cpp/wedpr-computing/ppc-psi/tests/labeled-psi/TestSenderDB.cpp
@@ -22,13 +22,13 @@
 #include "ppc-crypto-core/src/hash/Sha256Hash.h"
 #include "ppc-crypto/src/ecc/Ed25519EccCrypto.h"
 #include "ppc-crypto/src/oprf/EcdhOprf.h"
+#include "ppc-io/src/FileLineReader.h"
 #include "ppc-psi/src/labeled-psi/core/LabeledPSIParams.h"
 #include "ppc-psi/src/labeled-psi/core/SenderDB.h"
 #include "protocol/src/JsonTaskImpl.h"
 #include "test-utils/TaskMock.h"
 #include <bcos-utilities/testutils/TestPromptFixture.h>
 #include <boost/test/unit_test.hpp>
-
 using namespace ppc::psi;
 using namespace bcos;
 using namespace bcos::test;
diff --git a/cpp/wedpr-computing/ppc-psi/tests/ra2018-psi/TestEcdhPSIImpl.cpp b/cpp/wedpr-computing/ppc-psi/tests/ra2018-psi/TestEcdhPSIImpl.cpp
@@ -20,6 +20,7 @@
 #include "mock/Common.h"
 #include "mock/EcdhPSIFixture.h"
 // Note: it's better not to depends on the task-impl
+#include "ppc-io/src/FileLineReader.h"
 #include "protocol/src/JsonTaskImpl.h"
 #include "test-utils/TaskMock.h"
 #include <bcos-utilities/testutils/TestPromptFixture.h>
diff --git a/cpp/wedpr-computing/ppc-psi/tests/ra2018-psi/TestRA2018Impl.cpp b/cpp/wedpr-computing/ppc-psi/tests/ra2018-psi/TestRA2018Impl.cpp
@@ -20,6 +20,7 @@
 #include "mock/Common.h"
 #include "mock/RA2018PSIFixture.h"
 // Note: it's better not to depends on the task-impl
+#include "ppc-io/src/FileLineReader.h"
 #include "protocol/src/JsonTaskImpl.h"
 #include "test-utils/TaskMock.h"
 #include <bcos-utilities/testutils/TestPromptFixture.h>
diff --git a/cpp/wedpr-computing/ppc-psi/tests/ra2018-psi/TestRA2018Message.cpp b/cpp/wedpr-computing/ppc-psi/tests/ra2018-psi/TestRA2018Message.cpp
@@ -19,6 +19,7 @@
  */
 #include "mock/RA2018MessageFixture.h"
 #include "ppc-crypto-core/src/hash/Sha256Hash.h"
+#include "ppc-io/src/FileLineReader.h"
 #include "ppc-psi/src/ra2018-psi/Common.h"
 #include <bcos-utilities/testutils/TestPromptFixture.h>
 #include <boost/test/unit_test.hpp>
diff --git a/cpp/wedpr-computing/ppc-psi/tests/ra2018-psi/mock/Common.h b/cpp/wedpr-computing/ppc-psi/tests/ra2018-psi/mock/Common.h
@@ -18,12 +18,14 @@
  * @date 2022-12-29
  */
 #pragma once
+#include "ppc-io/src/FileLineReader.h"
 #include "protocol/src/JsonTaskImpl.h"
 #include "test-utils/TaskMock.h"
 #include <thread>
 
 using namespace bcos;
 using namespace ppc::protocol;
+using namespace ppc::io;
 
 namespace ppc::test
 {
diff --git a/cpp/wedpr-protocol/grpc/CMakeLists.txt b/cpp/wedpr-protocol/grpc/CMakeLists.txt
@@ -27,3 +27,8 @@ target_link_libraries(${SERVICE_PB_TARGET} PUBLIC ${PB_PROTOCOL_TARGET} gRPC::gr
 
 add_subdirectory(client)
 add_subdirectory(server)
+if (TESTS)
+    enable_testing()
+    set(CTEST_OUTPUT_ON_FAILURE TRUE)
+    add_subdirectory(tests)
+endif ()
diff --git a/cpp/wedpr-protocol/grpc/tests/CMakeLists.txt b/cpp/wedpr-protocol/grpc/tests/CMakeLists.txt
@@ -0,0 +1,10 @@
+file(GLOB_RECURSE SOURCES "*.cpp" "*.h")
+
+# cmake settings
+set(TEST_BINARY_NAME test-grpc-protocol)
+
+add_executable(${TEST_BINARY_NAME} ${SOURCES})
+target_include_directories(${TEST_BINARY_NAME} PRIVATE .)
+
+target_link_libraries(${TEST_BINARY_NAME} ${SERVICE_PB_TARGET} ${BCOS_UTILITIES_TARGET} ${BOOST_UNIT_TEST})
+add_test(NAME test-grpc-protocol WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND ${TEST_BINARY_NAME})
diff --git a/cpp/wedpr-protocol/grpc/tests/TestGrpc.cpp b/cpp/wedpr-protocol/grpc/tests/TestGrpc.cpp
@@ -0,0 +1,41 @@
+/*
+ *  Copyright (C) 2022 WeDPR.
+ *  SPDX-License-Identifier: Apache-2.0
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ * @file TestGrpc.cpp
+ * @author: yujiechen
+ * @date 2022-11-12
+ */
+
+#include "wedpr-protocol/grpc/Common.h"
+#include <bcos-utilities/testutils/TestPromptFixture.h>
+#include <boost/test/unit_test.hpp>
+
+using namespace ppc::protocol;
+using namespace bcos::test;
+using namespace grpc;
+
+BOOST_FIXTURE_TEST_SUITE(GrpcTest, TestPromptFixture)
+
+BOOST_AUTO_TEST_CASE(testGrpc)
+{
+    grpc::ChannelArguments args;
+    uint64_t msgSize = INT_MAX;
+    int convertedMsgSize = msgSize;
+    std::cout << "compare with -1, result: " << (convertedMsgSize >= -1) << std::endl;
+    args.SetInt(GRPC_ARG_MAX_RECEIVE_MESSAGE_LENGTH, INT_MAX);
+    std::cout << "##### " << GRPC_ARG_MAX_RECEIVE_MESSAGE_LENGTH << ", " << INT_MAX << std::endl;
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/cpp/wedpr-protocol/grpc/tests/main.cpp b/cpp/wedpr-protocol/grpc/tests/main.cpp
@@ -0,0 +1,2 @@
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
diff --git a/cpp/wedpr-transport/sdk/src/TransportBuilder.cpp b/cpp/wedpr-transport/sdk/src/TransportBuilder.cpp
@@ -19,6 +19,7 @@
  */
 
 #include "TransportBuilder.h"
+#include "Common.h"
 #include "ProTransportImpl.h"
 #include "Transport.h"
 #include "TransportImpl.h"
@@ -80,4 +81,5 @@ void TransportBuilder::initLog(const std::string& configPath)
     }
     m_logInitializer = std::make_shared<bcos::BoostLogInitializer>();
     m_logInitializer->initLog(pt, bcos::FileLogger, "gateway_sdk_log");
+    TRANSPORT_LOG(INFO) << LOG_DESC("init log success") << LOG_KV("configPath", configPath);
 }

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,8 @@`
`19`	`19`	`*/`
`20`	`20`	`#pragma once`
`21`	`21`	`#include "ppc-framework/protocol/Task.h"`
`22`		`-#include "ppc-io/src/FileLineReader.h"`
`23`	`22`	`#include <boost/test/unit_test.hpp>`
`24`	`23`
`25`		`-using namespace ppc::io;`
`26`	`24`	`using namespace ppc::protocol;`
`27`	`25`	`namespace ppc::test`
`28`	`26`	`{`
`@@ -91,4 +89,4 @@ inline void checkTask(Task::Ptr _task1, Task::Ptr _task2)`
`91`	`89`	`checkParty(it.second, _task2->getPartyByID(it.first));`
`92`	`90`	`}`
`93`	`91`	`}`
`94`		`-} // namespace ppc::test`
	`92`	`+} // namespace ppc::test`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@`
`9`	`9`	`"bcos-utilities",`
`10`	`10`	`"bcos-boostssl",`
`11`	`11`	`"tarscpp",`
`12`		`- "libhdfs3"`
	`12`	`+ "libhdfs3",`
	`13`	`+ "tbb"`
`13`	`14`	`]`
`14`	`15`	`}`
`15`	`16`	`]`