Merge branch 'feat/supernova-async-exec' into chain-handler-last-execution-info

Author: AdoAdoAdo

common/common.go

@@ -27,6 +27,10 @@ const (
 	nonceIndex     = 0
 )
 
+type executionResultHandler interface {
+	GetMiniBlockHeadersHandlers() []data.MiniBlockHeaderHandler
+}
+
 type chainParametersHandler interface {
 	CurrentChainParameters() config.ChainParametersByEpochConfig
 	ChainParametersForEpoch(epoch uint32) (config.ChainParametersByEpochConfig, error)
@@ -409,6 +413,23 @@ func ExtractBaseExecutionResultHandler(lastExecResultsHandler data.LastExecution
 	return baseExecutionResultsHandler, nil
 }
 
+// GetMiniBlocksHeaderHandlersFromExecResult returns miniblock handlers based on execution result
+func GetMiniBlocksHeaderHandlersFromExecResult(
+	baseExecResult data.BaseExecutionResultHandler,
+	headerShard uint32,
+) ([]data.MiniBlockHeaderHandler, error) {
+	if check.IfNil(baseExecResult) {
+		return nil, ErrNilBaseExecutionResult
+	}
+
+	execResult, ok := baseExecResult.(executionResultHandler)
+	if !ok {
+		return nil, ErrWrongTypeAssertion
+	}
+
+	return execResult.GetMiniBlockHeadersHandlers(), nil
+}
+
 // GetLastExecutionResultNonce returns last execution result nonce if header v3 enable, otherwise it returns provided header nonce
 func GetLastExecutionResultNonce(
 	header data.HeaderHandler,

common/common_test.go

@@ -578,6 +578,86 @@ func TestGetLastBaseExecutionResultHandler(t *testing.T) {
 	})
 }
 
+func TestGetMiniBlockHeaderHandlersFromExecResults(t *testing.T) {
+	t.Parallel()
+
+	t.Run("should fail if nil base execution result", func(t *testing.T) {
+		t.Parallel()
+
+		retExecResult, err := common.GetMiniBlocksHeaderHandlersFromExecResult(nil, 1)
+		require.Equal(t, common.ErrNilBaseExecutionResult, err)
+		require.Nil(t, retExecResult)
+	})
+
+	t.Run("should fail if wrong type for shard", func(t *testing.T) {
+		t.Parallel()
+
+		execResult := &block.BaseExecutionResult{}
+
+		retExecResult, err := common.GetMiniBlocksHeaderHandlersFromExecResult(execResult, 1)
+		require.Equal(t, common.ErrWrongTypeAssertion, err)
+		require.Nil(t, retExecResult)
+	})
+
+	t.Run("should work for shard", func(t *testing.T) {
+		t.Parallel()
+
+		mbh1 := block.MiniBlockHeader{
+			Hash: []byte("hash1"),
+		}
+		mbh2 := block.MiniBlockHeader{
+			Hash: []byte("hash1"),
+		}
+
+		miniBlockHeaders := []block.MiniBlockHeader{
+			mbh1,
+			mbh2,
+		}
+
+		execResult := &block.ExecutionResult{
+			MiniBlockHeaders: miniBlockHeaders,
+		}
+
+		expMiniBlockHandlers := []data.MiniBlockHeaderHandler{
+			&mbh1,
+			&mbh2,
+		}
+
+		retExecResult, err := common.GetMiniBlocksHeaderHandlersFromExecResult(execResult, 1)
+		require.Nil(t, err)
+		require.Equal(t, expMiniBlockHandlers, retExecResult)
+	})
+
+	t.Run("should work for meta", func(t *testing.T) {
+		t.Parallel()
+
+		mbh1 := block.MiniBlockHeader{
+			Hash: []byte("hash1"),
+		}
+		mbh2 := block.MiniBlockHeader{
+			Hash: []byte("hash1"),
+		}
+
+		miniBlockHeaders := []block.MiniBlockHeader{
+			mbh1,
+			mbh2,
+		}
+
+		execResult := &block.MetaExecutionResult{
+			MiniBlockHeaders: miniBlockHeaders,
+		}
+
+		expMiniBlockHandlers := []data.MiniBlockHeaderHandler{
+			&mbh1,
+			&mbh2,
+		}
+
+		retExecResult, err := common.GetMiniBlocksHeaderHandlersFromExecResult(execResult, core.MetachainShardId)
+		require.Nil(t, err)
+		require.Equal(t, expMiniBlockHandlers, retExecResult)
+	})
+}
+
 func TestPrepareLogEventsKey(t *testing.T) {
 	t.Parallel()
 

consensus/spos/worker.go

@@ -863,7 +863,7 @@ func (wrk *Worker) Extend(subroundId int) {
 	}
 
 	wrk.scheduledProcessor.ForceStopScheduledExecutionBlocking()
-	wrk.blockProcessor.RevertCurrentBlock()
+	wrk.blockProcessor.RevertCurrentBlock(wrk.consensusState.GetHeader())
 	wrk.removeConsensusHeaderFromPool()
 
 	log.Debug("current block is reverted")

consensus/spos/worker_test.go

@@ -58,7 +58,7 @@ func createDefaultWorkerArgs(appStatusHandler core.AppStatusHandler) *spos.Worke
 		DecodeBlockHeaderCalled: func(dta []byte) data.HeaderHandler {
 			return nil
 		},
-		RevertCurrentBlockCalled: func() {
+		RevertCurrentBlockCalled: func(_ data.HeaderHandler) {
 		},
 		DecodeBlockBodyCalled: func(dta []byte) data.BodyHandler {
 			return nil
@@ -796,7 +796,7 @@ func testWorkerProcessReceivedMessageComputeReceivedProposedBlockMetric(
 
 			return header
 		},
-		RevertCurrentBlockCalled: func() {
+		RevertCurrentBlockCalled: func(_ data.HeaderHandler) {
 		},
 		DecodeBlockBodyCalled: func(dta []byte) data.BodyHandler {
 			return nil
@@ -1210,7 +1210,7 @@ func TestWorker_ProcessReceivedMessageWrongChainIDInProposedBlockShouldError(t *
 					},
 				}
 			},
-			RevertCurrentBlockCalled: func() {
+			RevertCurrentBlockCalled: func(_ data.HeaderHandler) {
 			},
 		},
 	)
@@ -1263,7 +1263,7 @@ func TestWorker_ProcessReceivedMessageWithABadOriginatorShouldErr(t *testing.T)
 					},
 				}
 			},
-			RevertCurrentBlockCalled: func() {
+			RevertCurrentBlockCalled: func(_ data.HeaderHandler) {
 			},
 			DecodeBlockBodyCalled: func(dta []byte) data.BodyHandler {
 				return nil
@@ -1323,7 +1323,7 @@ func TestWorker_ProcessReceivedMessageWithHeaderAndWrongHash(t *testing.T) {
 					},
 				}
 			},
-			RevertCurrentBlockCalled: func() {
+			RevertCurrentBlockCalled: func(_ data.HeaderHandler) {
 			},
 			DecodeBlockBodyCalled: func(dta []byte) data.BodyHandler {
 				return nil
@@ -1394,7 +1394,7 @@ func TestWorker_ProcessReceivedMessageOkValsShouldWork(t *testing.T) {
 					},
 				}
 			},
-			RevertCurrentBlockCalled: func() {
+			RevertCurrentBlockCalled: func(_ data.HeaderHandler) {
 			},
 			DecodeBlockBodyCalled: func(dta []byte) data.BodyHandler {
 				return nil
@@ -2028,7 +2028,7 @@ func TestWorker_ExtendShouldWorkAfterAWhile(t *testing.T) {
 	wrk := *initWorker(&statusHandlerMock.AppStatusHandlerStub{})
 	executed := int32(0)
 	blockProcessor := &testscommon.BlockProcessorStub{
-		RevertCurrentBlockCalled: func() {
+		RevertCurrentBlockCalled: func(_ data.HeaderHandler) {
 			atomic.AddInt32(&executed, 1)
 		},
 	}
@@ -2053,7 +2053,7 @@ func TestWorker_ExtendShouldWork(t *testing.T) {
 	wrk := *initWorker(&statusHandlerMock.AppStatusHandlerStub{})
 	executed := int32(0)
 	blockProcessor := &testscommon.BlockProcessorStub{
-		RevertCurrentBlockCalled: func() {
+		RevertCurrentBlockCalled: func(_ data.HeaderHandler) {
 			atomic.AddInt32(&executed, 1)
 		},
 	}