Merge branch 'hotfix/2.3.4' of https://github.com/LiskHQ/lisk-sdk-pri…

…vate
LiskArchive · Sep 12, 2019 · 87a989c · 87a989c
2 parents cefffa7 + 87bf6d0
commit 87a989c
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 6 deletions.
diff --git a/framework/package-lock.json b/framework/package-lock.json
diff --git a/framework/package.json b/framework/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "lisk-framework",
-	"version": "0.4.3",
+	"version": "0.4.4",
 	"description": "Lisk blockchain application platform",
 	"author": "Lisk Foundation <admin@lisk.io>, lightcurve GmbH <admin@lightcurve.io>",
 	"license": "Apache-2.0",

diff --git a/framework/src/modules/chain/rounds/delegates.js b/framework/src/modules/chain/rounds/delegates.js
@@ -217,7 +217,11 @@ class Delegates {
 			cause,
 		};
 
-		await this.storage.entities.Account.insertFork(fork);
+		try {
+			await this.storage.entities.Account.insertFork(fork);
+		} catch (err) {
+			this.logger.warn(err, 'Failed to insert fork info');
+		}
 		this.channel.publish('chain:delegates:fork', fork);
 	}
 

diff --git a/framework/test/mocha/unit/modules/chain/submodules/delegates.js b/framework/test/mocha/unit/modules/chain/submodules/delegates.js
@@ -34,6 +34,7 @@ describe('delegates', () => {
 	const mockLogger = {
 		debug: sinonSandbox.stub(),
 		info: sinonSandbox.stub(),
+		warn: sinonSandbox.stub(),
 		error: sinonSandbox.stub(),
 	};
 	const mockStorage = {
@@ -112,6 +113,25 @@ describe('delegates', () => {
 					fork,
 				);
 			});
+
+			it('should not throw an error when the database fails', async () => {
+				const fork = {
+					delegatePublicKey: dummyBlock.generatorPublicKey,
+					blockTimestamp: dummyBlock.timestamp,
+					blockId: dummyBlock.id,
+					blockHeight: dummyBlock.height,
+					previousBlockId: dummyBlock.previousBlock,
+					cause,
+				};
+				mockStorage.entities.Account.insertFork.rejects(
+					new Error('invalid DB state'),
+				);
+				await delegatesModule.fork(dummyBlock, cause);
+				expect(mockChannel.publish).to.be.calledWithExactly(
+					'chain:delegates:fork',
+					fork,
+				);
+			});
 		});
 
 		describe('#generateDelegateList', () => {

diff --git a/sdk/package-lock.json b/sdk/package-lock.json
diff --git a/sdk/package.json b/sdk/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "lisk-sdk",
-	"version": "2.3.3",
+	"version": "2.3.4",
 	"description": "Official SDK for the Lisk blockchain application platform",
 	"author": "Lisk Foundation <admin@lisk.io>, lightcurve GmbH <admin@lightcurve.io>",
 	"license": "Apache-2.0",
@@ -25,6 +25,6 @@
 		"@liskhq/bignum": "1.3.1",
 		"@liskhq/lisk-cryptography": "2.3.0",
 		"@liskhq/lisk-transactions": "2.3.1",
-		"lisk-framework": "0.4.3"
+		"lisk-framework": "0.4.4"
 	}
 }