From 803e18fc56183fe1aed5b14af36bb52e65a90384 Mon Sep 17 00:00:00 2001
From: EclesioMeloJunior <eclesiomelo.1@gmail.com>
Date: Fri, 25 Mar 2022 10:22:50 -0400
Subject: [PATCH] chore: remove DigestHandler from core pkg

---
 dot/core/service.go      |  2 --
 dot/core/service_test.go | 36 +++++++++++++-----------------------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/dot/core/service.go b/dot/core/service.go
index 6ba60150738..7f068d1f9ba 100644
--- a/dot/core/service.go
+++ b/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
@@ -121,7 +120,6 @@ func NewService(cfg *Config) (*Service, error) {
 		blockAddCh:           blockAddCh,
 		codeSubstitute:       cfg.CodeSubstitutes,
 		codeSubstitutedState: cfg.CodeSubstitutedState,
-		digestHandler:        cfg.DigestHandler,
 	}
 
 	return srv, nil
diff --git a/dot/core/service_test.go b/dot/core/service_test.go
index 47eeae82f1d..3a178bfc830 100644
--- a/dot/core/service_test.go
+++ b/dot/core/service_test.go
@@ -273,6 +273,7 @@ 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)
@@ -280,6 +281,7 @@ func Test_Service_handleBlock(t *testing.T) {
 			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)
 	})