Merge pull request bitshares#2446 from bitshares/update-version

Set version in sonar-project.properties to 5.2.x
jmjatlanta · May 4, 2021 · c536ecf · c536ecf
2 parents b52e5e6 + c89028e
commit c536ecf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp
@@ -1600,17 +1600,19 @@ namespace graphene { namespace net { namespace detail {
       }
     }
 
-    void node_impl::on_connection_accepted_message(peer_connection* originating_peer, const connection_accepted_message& connection_accepted_message_received)
+    void node_impl::on_connection_accepted_message( peer_connection* originating_peer,
+                                                    const connection_accepted_message& )
     {
       VERIFY_CORRECT_THREAD();
       dlog("Received a connection_accepted in response to my \"hello\" from ${peer}",
            ("peer", originating_peer->get_remote_endpoint()));
       originating_peer->negotiation_status = peer_connection::connection_negotiation_status::peer_connection_accepted;
       originating_peer->our_state = peer_connection::our_connection_state::connection_accepted;
       originating_peer->send_message(address_request_message());
-      fc::time_point now = fc::time_point::now();
+      auto now = fc::time_point::now();
+      constexpr int64_t five = 5;
       if (_is_firewalled == firewalled_state::unknown &&
-          _last_firewall_check_message_sent < (now - fc::minutes(5)) &&
+          _last_firewall_check_message_sent < ( now - fc::minutes(five) ) &&
           originating_peer->core_protocol_version >= 106)
       {
         wlog("I don't know if I'm firewalled.  Sending a firewall check message to peer ${peer}",
@@ -1939,7 +1941,8 @@ namespace graphene { namespace net { namespace detail {
         std::vector<item_hash_t> blockchain_synopsis = create_blockchain_synopsis_for_peer( peer );
 
         item_hash_t last_item_seen = blockchain_synopsis.empty() ? item_hash_t() : blockchain_synopsis.back();
-        dlog( "sync: sending a request for the next items after ${last_item_seen} to peer ${peer}, (full request is ${blockchain_synopsis})",
+        dlog( "sync: sending a request for the next items after ${last_item_seen} to peer ${peer}, "
+              "(full request is ${blockchain_synopsis})",
              ( "last_item_seen", last_item_seen )
              ( "peer", peer->get_remote_endpoint() )
              ( "blockchain_synopsis", blockchain_synopsis ) );
@@ -2380,11 +2383,13 @@ namespace graphene { namespace net { namespace detail {
     {
       VERIFY_CORRECT_THREAD();
 
-      // expire old inventory so we'll be making decisions our about whether to fetch blocks below based only on recent inventory
+      // expire old inventory
+      // so we'll be making our decisions about whether to fetch blocks below based only on recent inventory
       originating_peer->clear_old_inventory();
 
       dlog( "received inventory of ${count} items from peer ${endpoint}",
-           ( "count", item_ids_inventory_message_received.item_hashes_available.size() )("endpoint", originating_peer->get_remote_endpoint() ) );
+            ("count", item_ids_inventory_message_received.item_hashes_available.size())
+            ("endpoint", originating_peer->get_remote_endpoint() ) );
       for( const item_hash_t& item_hash : item_ids_inventory_message_received.item_hashes_available )
       {
         item_id advertised_item_id(item_ids_inventory_message_received.item_type, item_hash);

diff --git a/libraries/net/node_impl.hxx b/libraries/net/node_impl.hxx
@@ -647,8 +647,7 @@ class node_impl : public peer_connection_delegate, public std::enable_shared_fro
       void on_hello_message( peer_connection* originating_peer,
                              const hello_message& hello_message_received );
 
-      void on_connection_accepted_message( peer_connection* originating_peer,
-                                           const connection_accepted_message& connection_accepted_message_received );
+      void on_connection_accepted_message( peer_connection* originating_peer, const connection_accepted_message& );
 
       void on_connection_rejected_message( peer_connection* originating_peer,
                                            const connection_rejected_message& connection_rejected_message_received );

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -3,7 +3,7 @@ sonar.organization=bitshares-on-github
 sonar.projectKey=bitshares_bitshares-core
 sonar.projectName=BitShares-Core
 sonar.projectDescription=BitShares Blockchain implementation and command-line interface
-sonar.projectVersion=5.2.0
+sonar.projectVersion=5.2.x
 
 sonar.host.url=https://sonarcloud.io