fix(dot/digest): BABE NextEpochData and NextConfigData should be set on finalization

dot/core/errors.go

@@ -44,9 +44,6 @@ var (
 	// ErrEmptyRuntimeCode is returned when the storage :code is empty
 	ErrEmptyRuntimeCode = errors.New("new :code is empty")
 
-	// ErrNilDigestHandler is returned when the DigestHandler interface is nil
-	ErrNilDigestHandler = errors.New("cannot have nil DigestHandler")
-
 	errNilCodeSubstitutedState = errors.New("cannot have nil CodeSubstitutedStat")
 )
 

dot/core/helpers_test.go

@@ -7,7 +7,6 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/ChainSafe/gossamer/dot/digest"
 	"github.com/ChainSafe/gossamer/dot/network"
 	"github.com/ChainSafe/gossamer/dot/state"
 	"github.com/ChainSafe/gossamer/internal/log"
@@ -32,10 +31,6 @@ func NewTestService(t *testing.T, cfg *Config) *Service {
 		cfg = &Config{}
 	}
 
-	if cfg.DigestHandler == nil {
-		cfg.DigestHandler = &digest.Handler{} // only for nil check in NewService
-	}
-
 	if cfg.Keystore == nil {
 		cfg.Keystore = keystore.NewGlobalKeystore()
 		kp, err := sr25519.GenerateKeypair()

dot/core/interface.go

@@ -17,7 +17,7 @@ import (
 	"github.com/ChainSafe/gossamer/lib/transaction"
 )
 
-//go:generate mockgen -destination=mock_core_test.go -package $GOPACKAGE . BlockState,StorageState,TransactionState,Network,EpochState,CodeSubstitutedState,DigestHandler
+//go:generate mockgen -destination=mock_core_test.go -package $GOPACKAGE . BlockState,StorageState,TransactionState,Network,EpochState,CodeSubstitutedState
 
 // BlockState interface for block state methods
 type BlockState interface {
@@ -87,8 +87,3 @@ type CodeSubstitutedState interface {
 	LoadCodeSubstitutedBlockHash() common.Hash
 	StoreCodeSubstitutedBlockHash(hash common.Hash) error
 }
-
-// DigestHandler is the interface for the consensus digest handler
-type DigestHandler interface {
-	HandleDigests(header *types.Header)
-}

dot/core/messages_integration_test.go

@@ -78,10 +78,6 @@ func TestService_HandleBlockProduced(t *testing.T) {
 		Keystore: keystore.NewGlobalKeystore(),
 	}
 
-	digestHandler := NewMockDigestHandler(ctrl)
-	digestHandler.EXPECT().HandleDigests(gomock.AssignableToTypeOf(new(types.Header)))
-	cfg.DigestHandler = digestHandler
-
 	s := NewTestService(t, cfg)
 	err := s.Start()
 	require.NoError(t, err)
@@ -137,9 +133,6 @@ func TestService_HandleTransactionMessage(t *testing.T) {
 	telemetryMock := NewMockClient(ctrl)
 	telemetryMock.EXPECT().SendMessage(gomock.Any()).AnyTimes()
 
-	digestHandler := NewMockDigestHandler(ctrl)
-	digestHandler.EXPECT().HandleDigests(gomock.AssignableToTypeOf(new(types.Header)))
-
 	net := NewMockNetwork(ctrl)
 	net.EXPECT().GossipMessage(gomock.AssignableToTypeOf(new(network.TransactionMessage))).AnyTimes()
 	net.EXPECT().IsSynced().Return(true).AnyTimes()
@@ -151,7 +144,6 @@ func TestService_HandleTransactionMessage(t *testing.T) {
 	cfg := &Config{
 		Keystore:         ks,
 		TransactionState: state.NewTransactionState(telemetryMock),
-		DigestHandler:    digestHandler,
 		Network:          net,
 	}
 

dot/core/service.go

@@ -50,7 +50,6 @@ type Service struct {
 	storageState     StorageState
 	transactionState TransactionState
 	net              Network
-	digestHandler    DigestHandler
 
 	// map of code substitutions keyed by block hash
 	codeSubstitute       map[common.Hash]string
@@ -71,7 +70,6 @@ type Config struct {
 	Network          Network
 	Keystore         *keystore.GlobalKeystore
 	Runtime          runtime.Instance
-	DigestHandler    DigestHandler
 
 	CodeSubstitutes      map[common.Hash]string
 	CodeSubstitutedState CodeSubstitutedState
@@ -96,10 +94,6 @@ func NewService(cfg *Config) (*Service, error) {
 		return nil, ErrNilNetwork
 	}
 
-	if cfg.DigestHandler == nil {
-		return nil, ErrNilDigestHandler
-	}
-
 	if cfg.CodeSubstitutedState == nil {
 		return nil, errNilCodeSubstitutedState
 	}
@@ -121,7 +115,6 @@ func NewService(cfg *Config) (*Service, error) {
 		blockAddCh:           blockAddCh,
 		codeSubstitute:       cfg.CodeSubstitutes,
 		codeSubstitutedState: cfg.CodeSubstitutedState,
-		digestHandler:        cfg.DigestHandler,
 	}
 
 	return srv, nil
@@ -218,9 +211,6 @@ func (s *Service) handleBlock(block *types.Block, state *rtstorage.TrieState) er
 	logger.Debugf("imported block %s and stored state trie with root %s",
 		block.Header.Hash(), state.MustRoot())
 
-	// handle consensus digests
-	s.digestHandler.HandleDigests(&block.Header)
-
 	rt, err := s.blockState.GetRuntime(&block.Header.ParentHash)
 	if err != nil {
 		return err

dot/core/service_integration_test.go

@@ -167,10 +167,6 @@ func TestAnnounceBlock(t *testing.T) {
 		Network: net,
 	}
 
-	digestHandler := NewMockDigestHandler(ctrl)
-	digestHandler.EXPECT().HandleDigests(gomock.AssignableToTypeOf(new(types.Header)))
-	cfg.DigestHandler = digestHandler
-
 	s := NewTestService(t, cfg)
 	err := s.Start()
 	require.NoError(t, err)
@@ -583,9 +579,6 @@ func TestService_GetRuntimeVersion(t *testing.T) {
 func TestService_HandleSubmittedExtrinsic(t *testing.T) {
 	cfg := &Config{}
 	ctrl := gomock.NewController(t)
-	digestHandler := NewMockDigestHandler(ctrl)
-	digestHandler.EXPECT().HandleDigests(gomock.AssignableToTypeOf(new(types.Header)))
-	cfg.DigestHandler = digestHandler
 
 	net := NewMockNetwork(ctrl)
 	net.EXPECT().GossipMessage(gomock.AssignableToTypeOf(new(network.TransactionMessage)))

dot/core/service_test.go

@@ -273,13 +273,15 @@ func Test_Service_handleCodeSubstitution(t *testing.T) {
 
 func Test_Service_handleBlock(t *testing.T) {
 	t.Parallel()
+
 	execTest := func(t *testing.T, s *Service, block *types.Block, trieState *rtstorage.TrieState, expErr error) {
 		err := s.handleBlock(block, trieState)
 		assert.ErrorIs(t, err, expErr)
 		if expErr != nil {
 			assert.EqualError(t, err, expErr.Error())
 		}
 	}
+
 	t.Run("nil input", func(t *testing.T) {
 		t.Parallel()
 		service := &Service{}
@@ -366,13 +368,10 @@ func Test_Service_handleBlock(t *testing.T) {
 		mockBlockState := NewMockBlockState(ctrl)
 		mockBlockState.EXPECT().AddBlock(&block).Return(blocktree.ErrBlockExists)
 		mockBlockState.EXPECT().GetRuntime(&block.Header.ParentHash).Return(nil, errTestDummyError)
-		mockDigestHandler := NewMockDigestHandler(ctrl)
-		mockDigestHandler.EXPECT().HandleDigests(&block.Header)
 
 		service := &Service{
-			storageState:  mockStorageState,
-			blockState:    mockBlockState,
-			digestHandler: mockDigestHandler,
+			storageState: mockStorageState,
+			blockState:   mockBlockState,
 		}
 		execTest(t, service, &block, trieState, errTestDummyError)
 	})
@@ -396,13 +395,10 @@ func Test_Service_handleBlock(t *testing.T) {
 		mockBlockState.EXPECT().GetRuntime(&block.Header.ParentHash).Return(runtimeMock, nil)
 		mockBlockState.EXPECT().HandleRuntimeChanges(trieState, runtimeMock, block.Header.Hash()).
 			Return(errTestDummyError)
-		mockDigestHandler := NewMockDigestHandler(ctrl)
-		mockDigestHandler.EXPECT().HandleDigests(&block.Header)
 
 		service := &Service{
-			storageState:  mockStorageState,
-			blockState:    mockBlockState,
-			digestHandler: mockDigestHandler,
+			storageState: mockStorageState,
+			blockState:   mockBlockState,
 		}
 		execTest(t, service, &block, trieState, errTestDummyError)
 	})
@@ -425,14 +421,11 @@ func Test_Service_handleBlock(t *testing.T) {
 		mockBlockState.EXPECT().AddBlock(&block).Return(blocktree.ErrBlockExists)
 		mockBlockState.EXPECT().GetRuntime(&block.Header.ParentHash).Return(runtimeMock, nil)
 		mockBlockState.EXPECT().HandleRuntimeChanges(trieState, runtimeMock, block.Header.Hash()).Return(nil)
-		mockDigestHandler := NewMockDigestHandler(ctrl)
-		mockDigestHandler.EXPECT().HandleDigests(&block.Header)
 
 		service := &Service{
-			storageState:  mockStorageState,
-			blockState:    mockBlockState,
-			digestHandler: mockDigestHandler,
-			ctx:           context.Background(),
+			storageState: mockStorageState,
+			blockState:   mockBlockState,
+			ctx:          context.Background(),
 		}
 		execTest(t, service, &block, trieState, nil)
 	})
@@ -488,17 +481,14 @@ func Test_Service_HandleBlockProduced(t *testing.T) {
 		mockBlockState.EXPECT().AddBlock(&block).Return(blocktree.ErrBlockExists)
 		mockBlockState.EXPECT().GetRuntime(&block.Header.ParentHash).Return(runtimeMock, nil)
 		mockBlockState.EXPECT().HandleRuntimeChanges(trieState, runtimeMock, block.Header.Hash()).Return(nil)
-		mockDigestHandler := NewMockDigestHandler(ctrl)
-		mockDigestHandler.EXPECT().HandleDigests(&block.Header)
 		mockNetwork := NewMockNetwork(ctrl)
 		mockNetwork.EXPECT().GossipMessage(msg)
 
 		service := &Service{
-			storageState:  mockStorageState,
-			blockState:    mockBlockState,
-			digestHandler: mockDigestHandler,
-			net:           mockNetwork,
-			ctx:           context.Background(),
+			storageState: mockStorageState,
+			blockState:   mockBlockState,
+			net:          mockNetwork,
+			ctx:          context.Background(),
 		}
 		execTest(t, service, &block, trieState, nil)
 	})