chore: remove DigestHandler from core pkg

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/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

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)
 	})

dot/node.go

@@ -287,7 +287,7 @@ func NewNode(cfg *Config, ks *keystore.GlobalKeystore) (*Node, error) {
 	}
 	nodeSrvcs = append(nodeSrvcs, dh)
 
-	coreSrvc, err := createCoreService(cfg, ks, stateSrvc, networkSrvc, dh)
+	coreSrvc, err := createCoreService(cfg, ks, stateSrvc, networkSrvc)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create core service: %s", err)
 	}

dot/rpc/http_test.go

@@ -407,12 +407,6 @@ func newCoreServiceTest(t *testing.T) *core.Service {
 		CodeSubstitutedState: stateSrvc.Base,
 	}
 
-	digestHandler := NewMockDigestHandler(ctrl)
-	digestHandler.EXPECT().
-		HandleDigests(gomock.AssignableToTypeOf(new(types.Header))).
-		AnyTimes()
-	cfg.DigestHandler = digestHandler
-
 	cfg.Keystore = keystore.NewGlobalKeystore()
 	kp, err := sr25519.GenerateKeypair()
 	require.NoError(t, err)

dot/rpc/modules/author_integration_test.go

@@ -727,7 +727,6 @@ func newAuthorModule(t *testing.T, integrationTestController *integrationTestCon
 	t.Helper()
 
 	codeSubstitutedStateMock := NewMockCodeSubstitutedState(nil)
-	digestHandlerMock := NewMockDigestHandler(nil)
 
 	cfg := &core.Config{
 		TransactionState:     integrationTestController.stateSrv.Transaction,
@@ -736,7 +735,6 @@ func newAuthorModule(t *testing.T, integrationTestController *integrationTestCon
 		Network:              integrationTestController.network,
 		Keystore:             integrationTestController.keystore,
 		CodeSubstitutedState: codeSubstitutedStateMock,
-		DigestHandler:        digestHandlerMock,
 	}
 
 	core2test, err := core.NewService(cfg)

dot/rpc/modules/system_integration_test.go

@@ -375,8 +375,6 @@ func newCoreService(t *testing.T, srvc *state.Service) *core.Service {
 		gomock.AssignableToTypeOf(new(network.TransactionMessage))).
 		AnyTimes()
 
-	digestHandlerMock := NewMockDigestHandler(nil)
-
 	cfg := &core.Config{
 		Runtime:              rt,
 		Keystore:             ks,
@@ -386,7 +384,6 @@ func newCoreService(t *testing.T, srvc *state.Service) *core.Service {
 		EpochState:           srvc.Epoch,
 		Network:              mocknet,
 		CodeSubstitutedState: srvc.Base,
-		DigestHandler:        digestHandlerMock,
 	}
 
 	s, err := core.NewService(cfg)

dot/services.go

@@ -229,7 +229,7 @@ func createBABEService(cfg *Config, st *state.Service, ks keystore.Keystore,
 
 // createCoreService creates the core service from the provided core configuration
 func createCoreService(cfg *Config, ks *keystore.GlobalKeystore,
-	st *state.Service, net *network.Service, dh *digest.Handler) (
+	st *state.Service, net *network.Service) (
 	*core.Service, error) {
 	logger.Debug("creating core service" +
 		asAuthority(cfg.Core.Roles == types.AuthorityRole) +
@@ -254,7 +254,6 @@ func createCoreService(cfg *Config, ks *keystore.GlobalKeystore,
 		TransactionState:     st.Transaction,
 		Keystore:             ks,
 		Network:              net,
-		DigestHandler:        dh,
 		CodeSubstitutes:      codeSubs,
 		CodeSubstitutedState: st.Base,
 	}

dot/services_integration_test.go

@@ -59,10 +59,7 @@ func TestCreateCoreService(t *testing.T) {
 
 	networkSrvc := &network.Service{}
 
-	dh, err := createDigestHandler(cfg.Log.DigestLvl, stateSrvc)
-	require.NoError(t, err)
-
-	coreSrvc, err := createCoreService(cfg, ks, stateSrvc, networkSrvc, dh)
+	coreSrvc, err := createCoreService(cfg, ks, stateSrvc, networkSrvc)
 	require.NoError(t, err)
 	require.NotNil(t, coreSrvc)
 }
@@ -105,10 +102,7 @@ func TestCreateSyncService(t *testing.T) {
 	ver, err := createBlockVerifier(stateSrvc)
 	require.NoError(t, err)
 
-	dh, err := createDigestHandler(cfg.Log.DigestLvl, stateSrvc)
-	require.NoError(t, err)
-
-	coreSrvc, err := createCoreService(cfg, ks, stateSrvc, &network.Service{}, dh)
+	coreSrvc, err := createCoreService(cfg, ks, stateSrvc, &network.Service{})
 	require.NoError(t, err)
 
 	_, err = newSyncService(cfg, stateSrvc, &grandpa.Service{}, ver, coreSrvc, &network.Service{}, nil)
@@ -162,10 +156,7 @@ func TestCreateRPCService(t *testing.T) {
 	err = loadRuntime(cfg, ns, stateSrvc, ks, networkSrvc)
 	require.NoError(t, err)
 
-	dh, err := createDigestHandler(cfg.Log.DigestLvl, stateSrvc)
-	require.NoError(t, err)
-
-	coreSrvc, err := createCoreService(cfg, ks, stateSrvc, networkSrvc, dh)
+	coreSrvc, err := createCoreService(cfg, ks, stateSrvc, networkSrvc)
 	require.NoError(t, err)
 
 	sysSrvc, err := createSystemService(&cfg.System, stateSrvc)
@@ -208,10 +199,7 @@ func TestCreateBABEService(t *testing.T) {
 	err = loadRuntime(cfg, ns, stateSrvc, ks, &network.Service{})
 	require.NoError(t, err)
 
-	dh, err := createDigestHandler(cfg.Log.DigestLvl, stateSrvc)
-	require.NoError(t, err)
-
-	coreSrvc, err := createCoreService(cfg, ks, stateSrvc, &network.Service{}, dh)
+	coreSrvc, err := createCoreService(cfg, ks, stateSrvc, &network.Service{})
 	require.NoError(t, err)
 
 	bs, err := createBABEService(cfg, stateSrvc, ks.Babe, coreSrvc, nil)
@@ -312,10 +300,7 @@ func TestNewWebSocketServer(t *testing.T) {
 	err = loadRuntime(cfg, ns, stateSrvc, ks, networkSrvc)
 	require.NoError(t, err)
 
-	dh, err := createDigestHandler(cfg.Log.DigestLvl, stateSrvc)
-	require.NoError(t, err)
-
-	coreSrvc, err := createCoreService(cfg, ks, stateSrvc, networkSrvc, dh)
+	coreSrvc, err := createCoreService(cfg, ks, stateSrvc, networkSrvc)
 	require.NoError(t, err)
 
 	sysSrvc, err := createSystemService(&cfg.System, stateSrvc)