format code

CODING_STYLE.md

@@ -25,8 +25,8 @@ Use clang-format tool to format your changes, see [CONTRIBUTING](CONTRIBUTING.md
 ## Preprocessor
 
 1. File comment is always at top, and includes:
-   - Copyright.
-   - License.
+    - Copyright.
+    - License.
 
 2. Never use `#ifdef`/`#define`/`#endif` file guards. Prefer `#pragma once` as first line below file comment.
 3. Prefer static const variable to value macros.
@@ -48,7 +48,6 @@ GOLDEN RULE: Preprocessor: ALL_CAPS; C++: camelCase.
 
 All other entities' first alpha is lower case.
 
-
 ## Variable prefixes
 
 1. Leading underscore `_` to parameter names.
@@ -60,8 +59,6 @@ All other entities' first alpha is lower case.
 3. Leading `g_` to global (non-const) variables.
 4. Leading `s_` to static (non-const, non-global) variables.
 
-
-
 ## Error reporting
 
 Prefer exception to bool/int return type.

codecov.yml

@@ -10,7 +10,7 @@ coverage:
   status:
     project:
       app:
-        target: 70
+        target: 73
         threshold: 0.05
         paths: "!test/"
       default:
@@ -19,6 +19,7 @@ coverage:
     patch:
       default:
         target: 10
+        enabled: no
     changes:
       default:
         enabled: no

libinitializer/P2PInitializer.h

@@ -37,7 +37,13 @@ class P2PInitializer : public std::enable_shared_from_this<P2PInitializer>
 public:
     typedef std::shared_ptr<P2PInitializer> Ptr;
 
-    ~P2PInitializer() {}
+    ~P2PInitializer()
+    {
+        if (m_p2pService)
+        {
+            m_p2pService->stop();
+        }
+    }
 
     void initConfig(boost::property_tree::ptree const& _pt);
 

libnetwork/Host.cpp

@@ -273,6 +273,7 @@ void Host::start()
         m_run = true;
         m_asioInterface->init(m_listenHost, m_listenPort);
         m_hostThread = std::make_shared<std::thread>([&] {
+            dev::pthread_setThreadName("io_service");
             while (haveNetwork())
             {
                 try

libnetwork/Session.cpp

@@ -315,10 +315,9 @@ void Session::drop(DisconnectReason _reason)
             /// if get Host object failed, close the socket directly
             auto socket = m_socket;
             auto server = m_server.lock();
-            if (server || !server->asioInterface() || !server->asioInterface()->ioService())
+            if (server && socket->isConnected())
             {
-                if (socket->isConnected())
-                    socket->close();
+                socket->close();
             }
             auto shutdown_timer =
                 std::make_shared<boost::asio::deadline_timer>(*server->asioInterface()->ioService(),

libnetwork/Session.h

@@ -173,7 +173,7 @@ class Session : public SessionFace, public std::enable_shared_from_this<Session>
     std::shared_ptr<std::unordered_map<uint32_t, ResponseCallback::Ptr>> m_seq2Callback;
 
     std::function<void(NetworkException, SessionFace::Ptr, Message::Ptr)> m_messageHandler;
-    uint64_t m_shutDownTimeThres = 30000;
+    uint64_t m_shutDownTimeThres = 3000;
 };
 
 class SessionFactory

tools/build_chain.sh

@@ -99,7 +99,7 @@ LOG_INFO "Start Port        : $port_start"
 LOG_INFO "Server IP         : ${ip_array[@]}"
 LOG_INFO "State Type        : ${state_type}"
 LOG_INFO "RPC listen IP     : ${listen_ip}"
-LOG_INFO "SDK PKCS12 Passwd : ${pkcs12_passwd}"
+[ ! -z ${pkcs12_passwd} ] && LOG_INFO "SDK PKCS12 Passwd : ${pkcs12_passwd}"
 LOG_INFO "Output Dir        : $output_dir"
 LOG_INFO "CA Key Path       : $ca_file"
 echo "=============================================================="
@@ -189,7 +189,7 @@ gen_chain_cert() {
 gen_agency_cert() {
     chain="$2"
     agencypath="$3"
-    name=`getname "$agencypath"`
+    name=$(getname "$agencypath")
 
     dir_must_exists "$chain"
     file_must_exists "$chain/ca.key"
@@ -233,9 +233,9 @@ gen_node_cert() {
     fi
 
     agpath="$2"
-    agency=`getname "$agpath"`
+    agency=$(getname "$agpath")
     ndpath="$3"
-    node=`getname "$ndpath"`
+    node=$(getname "$ndpath")
     dir_must_exists "$agpath"
     file_must_exists "$agpath/agency.key"
     check_name agency "$agency"
@@ -250,8 +250,8 @@ gen_node_cert() {
     cp $agpath/ca.crt $agpath/agency.crt $ndpath
 
     cd $ndpath
-    nodeid=`cat node.nodeid | head`
-    serial=`cat node.serial | head`
+    nodeid=$(cat node.nodeid | head)
+    serial=$(cat node.serial | head)
     cat >node.json <<EOF
 {
  "id":"$nodeid",
@@ -290,7 +290,7 @@ read_password() {
 gen_sdk_cert() {
     agency="$2"
     sdkpath="$3"
-    sdk=`getname "$sdkpath"`
+    sdk=$(getname "$sdkpath")
     dir_must_exists "$agency"
     file_must_exists "$agency/agency.key"
     dir_must_not_exists "$sdkpath"
@@ -661,7 +661,7 @@ for line in ${ip_array[*]};do
             rm node.json node.param node.private node.ca node.pubkey
             mv *.* ${conf_path}/
             cd $output_dir
-            privateKey=`openssl ec -in "$node_dir/${conf_path}/node.key" -text 2> /dev/null| sed -n '3,5p' | sed 's/://g'| tr "\n" " "|sed 's/ //g'`
+            privateKey=$(openssl ec -in "$node_dir/${conf_path}/node.key" -text 2> /dev/null| sed -n '3,5p' | sed 's/://g'| tr "\n" " "|sed 's/ //g')
             len=${#privateKey}
             head2=${privateKey:0:2}
             if [ "64" == "${len}" ] && [ "00" != "$head2" ];then
@@ -687,14 +687,14 @@ for line in ${ip_array[*]};do
                 echo "groups_count[${j}]=${groups_count[${j}]}"  >> $output_dir/${logfile}
         groups[${j}]=$"${groups[${j}]}node.${groups_count[${j}]}=${nodeid}
     "
-                ((++groups_count[${j}]))
+                ((++groups_count[j]))
             done
         else
         nodeid_list=$"${nodeid_list}node.${count}=${nodeid}
     "
         fi
 
-        ip_list=$"${ip_list}node.${count}="${ip}:$(( port_start + ${i} * 3 ))"
+        ip_list=$"${ip_list}node.${count}="${ip}:$(( port_start + i * 3 ))"
     "
         ((++count))
     done