Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set version in sonar-project.properties to 5.2.x #2446

Merged
merged 3 commits into from
May 4, 2021
Merged

Set version in sonar-project.properties to 5.2.x #2446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01b08d5
Set version in sonar-project.properties to 5.2.x
abitmore May 3, 2021
5874ad8
Wrap long lines
abitmore May 3, 2021
c89028e
Fix code smells
abitmore May 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions libraries/net/node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}",
Expand Down Expand Up @@ -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 ) );
Expand Down Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions libraries/net/node_impl.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down