Skip to content

Commit 6cff60f

Browse files
committed
- Refactored Key Gen Transaction sender.
- respects now Nonces of transactions in the chain - Log Cleanup
1 parent cda5b9d commit 6cff60f

File tree

3 files changed

+263
-135
lines changed

3 files changed

+263
-135
lines changed

crates/ethcore/src/engines/hbbft/hbbft_peers_handler.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,6 @@ impl HbbftPeersHandler {
177177
error!(target: "engine", "Error trying to announce own internet address: {:?}", error);
178178
}
179179

180-
trace!(target: "engine", "Success: trying to announce own internet address for mining address: {:?}", mining_address);
181-
182180
return Ok(());
183181
}
184182

crates/ethcore/src/engines/hbbft/hbbft_peers_management.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -371,9 +371,9 @@ impl HbbftPeersManagement {
371371
engine_client: &dyn EngineClient,
372372
mining_address: &Address,
373373
staking_address: &Address,
374-
) -> Result<(), String> {
374+
) -> Result<bool, String> {
375375
if !self.should_announce_own_internet_address(block_chain_client) {
376-
return Ok(());
376+
return Ok(false);
377377
}
378378
// updates the nodes internet address if the information on the blockchain is outdated.
379379

@@ -392,7 +392,7 @@ impl HbbftPeersManagement {
392392
endpoint
393393
} else {
394394
warn!(target: "engine", "devp2p endpoint not available.");
395-
return Ok(());
395+
return Ok(false);
396396
}
397397
} else {
398398
error!(target: "engine", "Unable to lock reserved_peers_management");
@@ -413,7 +413,7 @@ impl HbbftPeersManagement {
413413
// we don't need to do anything.
414414
// but we cache the current endpoint, so we don't have to query the db again.
415415
self.last_written_internet_address = Some(current_endpoint);
416-
return Ok(());
416+
return Ok(false);
417417
}
418418

419419
match set_validator_internet_address(
@@ -423,7 +423,7 @@ impl HbbftPeersManagement {
423423
) {
424424
Ok(()) => {
425425
self.last_written_internet_address = Some(current_endpoint);
426-
return Ok(());
426+
return Ok(true);
427427
}
428428
Err(err) => {
429429
error!(target: "engine", "unable to set validator internet address: {:?}", err);

0 commit comments

Comments
 (0)