Disabling broadcasts while round is ticking #82.

LiskArchive · May 22, 2016 · c47e373 · c47e373
1 parent e4915df
commit c47e373
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/modules/blocks.js b/modules/blocks.js
@@ -1131,6 +1131,8 @@ Blocks.prototype.sandboxApi = function (call, args, cb) {
 
 // Events
 Blocks.prototype.onReceiveBlock = function (block) {
+	// When client is not loaded, is syncing or round is ticking
+	// Do not receive new blocks as client is not ready to receive them
 	if (!private.loaded || modules.loader.syncing() || modules.round.ticking()) {
 		return;
 	}

diff --git a/modules/delegates.js b/modules/delegates.js
@@ -506,8 +506,10 @@ private.loop = function (cb) {
 		return setImmediate(cb);
 	}
 
+	// When client is not loaded, is syncing or round is ticking
+	// Do not try to forge new blocks as client is not ready
 	if (!private.loaded || modules.loader.syncing() || !modules.round.loaded() || modules.round.ticking()) {
-		library.logger.debug('Loop:', 'node not ready');
+		library.logger.debug('Loop:', 'client not ready');
 		return setImmediate(cb);
 	}
 

diff --git a/modules/transport.js b/modules/transport.js
@@ -452,9 +452,13 @@ private.hashsum = function (obj) {
 
 // Public methods
 Transport.prototype.broadcast = function (config, options, cb) {
-	if (modules.loader.syncing() || !private.loaded) {
+	// When client is not loaded, is syncing or round is ticking
+	// Skip broadcast as client is not ready to make them
+	if (!private.loaded || modules.loader.syncing() || modules.round.ticking()) {
+		library.logger.debug("Skipping broadcast, client is not ready");
 		return cb && setImmediate(cb);
 	}
+
 	config.limit = config.limit || 1;
 	modules.peer.list(config, function (err, peers) {
 		if (!err) {