Merge pull request #4674 from LiskHQ/4668_duplicate_key

Fix processor block save ordering - Closes #4668
LiskArchive · Jan 9, 2020 · f8a115d · f8a115d
2 parents 6b5449d + df84226
commit f8a115d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 18 deletions.
diff --git a/framework/src/modules/chain/processor/processor.js b/framework/src/modules/chain/processor/processor.js
@@ -304,11 +304,6 @@ class Processor {
 				});
 			}
 
-			if (!skipSave) {
-				// TODO: After moving everything to state store, save should get the state store and finalize the state store
-				await this.blocksModule.save(blockJSON, tx);
-			}
-
 			// Apply should always be executed after save as it performs database calculations
 			// i.e. Dpos.apply expects to have this processing block in the database
 			await processor.apply.run({
@@ -319,6 +314,11 @@ class Processor {
 				tx,
 			});
 
+			if (!skipSave) {
+				// TODO: After moving everything to state store, save should get the state store and finalize the state store
+				await this.blocksModule.save(blockJSON, tx);
+			}
+
 			if (removeFromTempTable) {
 				await this.blocksModule.removeBlockFromTempTable(block.id, tx);
 				this.logger.debug(

diff --git a/framework/test/jest/unit/specs/modules/chain/dpos/apply.spec.js b/framework/test/jest/unit/specs/modules/chain/dpos/apply.spec.js
@@ -307,6 +307,7 @@ describe('dpos.apply()', () => {
 				reward: rewardPerDelegate,
 				height: 809 + i,
 			}));
+
 			forgedBlocks.splice(forgedBlocks.length - 1);
 
 			lastBlockOfTheRoundNine = {

diff --git a/framework/test/jest/unit/specs/modules/chain/processor/processor.spec.js b/framework/test/jest/unit/specs/modules/chain/processor/processor.spec.js
@@ -487,15 +487,17 @@ describe('processor', () => {
 			});
 
 			it('should emit newBlock event for the block', async () => {
-				expect(
-					channelStub.publish,
-				).toHaveBeenCalledWith('chain:processor:newBlock', { block: blockV0 });
+				expect(channelStub.publish).toHaveBeenCalledWith(
+					'chain:processor:newBlock',
+					{ block: blockV0 },
+				);
 			});
 
 			it('should emit broadcast event for the block', async () => {
-				expect(
-					channelStub.publish,
-				).toHaveBeenCalledWith('chain:processor:broadcast', { block: blockV0 });
+				expect(channelStub.publish).toHaveBeenCalledWith(
+					'chain:processor:broadcast',
+					{ block: blockV0 },
+				);
 			});
 		});
 
@@ -708,15 +710,17 @@ describe('processor', () => {
 			});
 
 			it('should broadcast with the block', async () => {
-				expect(
-					channelStub.publish,
-				).toHaveBeenCalledWith('chain:processor:broadcast', { block: blockV0 });
+				expect(channelStub.publish).toHaveBeenCalledWith(
+					'chain:processor:broadcast',
+					{ block: blockV0 },
+				);
 			});
 
 			it('should emit newBlock event with the block', async () => {
-				expect(
-					channelStub.publish,
-				).toHaveBeenCalledWith('chain:processor:newBlock', { block: blockV0 });
+				expect(channelStub.publish).toHaveBeenCalledWith(
+					'chain:processor:newBlock',
+					{ block: blockV0 },
+				);
 			});
 		});
 	});
@@ -986,7 +990,7 @@ describe('processor', () => {
 
 			it('should apply the block', async () => {
 				applySteps.forEach(step => {
-					expect(step).not.toHaveBeenCalled();
+					expect(step).toHaveBeenCalled();
 				});
 			});