Skip to content

Commit

Permalink
fixes after review
Browse files Browse the repository at this point in the history
  • Loading branch information
ssd04 committed Sep 22, 2023
1 parent c2bb1a5 commit aae6c87
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 31 deletions.
2 changes: 1 addition & 1 deletion api/groups/eventsGroup.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func checkEventsGroupArgs(args ArgsEventsGroup) error {
func getPayloadVersion(c *gin.Context) uint32 {
version, err := strconv.Atoi(c.GetHeader(payloadVersionHeaderKey))
if err != nil {
log.Warn("failed to parse version header, used default version")
log.Debug("failed to parse version header, used default version")
return common.PayloadV0
}

Expand Down
12 changes: 6 additions & 6 deletions process/payloadHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ var ErrInvalidPayloadType = errors.New("invalid payload type")
var ErrInvalidPayloadVersion = errors.New("invalid payload version")

type payloadHandler struct {
dp map[uint32]DataProcessor
actions map[string]func(marshalledData []byte, version uint32) error
dataProcessors map[uint32]DataProcessor
actions map[string]func(marshalledData []byte, version uint32) error
}

// NewPayloadHandler will create a new instance of events indexer
Expand All @@ -27,7 +27,7 @@ func NewPayloadHandler(dataProcessors map[uint32]DataProcessor) (*payloadHandler
}

payloadIndexer := &payloadHandler{
dp: dataProcessors,
dataProcessors: dataProcessors,
}
payloadIndexer.initActionsMap()

Expand Down Expand Up @@ -59,7 +59,7 @@ func (ph *payloadHandler) ProcessPayload(payload []byte, topic string, version u
}

func (ph *payloadHandler) saveBlock(marshalledData []byte, version uint32) error {
dataProcessor, ok := ph.dp[version]
dataProcessor, ok := ph.dataProcessors[version]
if !ok {
log.Warn("invalid provided version", "version", version)
return ErrInvalidPayloadType
Expand All @@ -69,7 +69,7 @@ func (ph *payloadHandler) saveBlock(marshalledData []byte, version uint32) error
}

func (ph *payloadHandler) revertIndexedBlock(marshalledData []byte, version uint32) error {
dataProcessor, ok := ph.dp[version]
dataProcessor, ok := ph.dataProcessors[version]
if !ok {
log.Warn("invalid provided version", "version", version)
return ErrInvalidPayloadType
Expand All @@ -79,7 +79,7 @@ func (ph *payloadHandler) revertIndexedBlock(marshalledData []byte, version uint
}

func (ph *payloadHandler) finalizedBlock(marshalledData []byte, version uint32) error {
dataProcessor, ok := ph.dp[version]
dataProcessor, ok := ph.dataProcessors[version]
if !ok {
log.Warn("invalid provided version", "version", version)
return ErrInvalidPayloadType
Expand Down
9 changes: 9 additions & 0 deletions process/preprocess/basePreProcessor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,20 @@ package preprocess_test
import (
"testing"

"github.com/multiversx/mx-chain-core-go/core/mock"
"github.com/multiversx/mx-chain-notifier-go/common"
"github.com/multiversx/mx-chain-notifier-go/mocks"
"github.com/multiversx/mx-chain-notifier-go/process/preprocess"
"github.com/stretchr/testify/require"
)

func createMockEventsDataPreProcessorArgs() preprocess.ArgsEventsPreProcessor {
return preprocess.ArgsEventsPreProcessor{
Marshaller: &mock.MarshalizerMock{},
Facade: &mocks.FacadeStub{},
}
}

func TestNewBaseEventsPreProcessor(t *testing.T) {
t.Parallel()

Expand Down
21 changes: 0 additions & 21 deletions process/preprocess/dataPreProcessor_test.go

This file was deleted.

2 changes: 1 addition & 1 deletion process/preprocess/eventsPreProcessorV0.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ func (d *eventsPreProcessorV0) RevertIndexedBlock(marshalledData []byte) error {
return nil
}

// FinalizedBlock will handler the finalized block event
// FinalizedBlock will handle the finalized block event
func (d *eventsPreProcessorV0) FinalizedBlock(marshalledData []byte) error {
finalizedBlock := &data.FinalizedBlock{}
err := d.marshaller.Unmarshal(finalizedBlock, marshalledData)
Expand Down
2 changes: 1 addition & 1 deletion process/preprocess/eventsPreProcessorV1.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func (d *eventsPreProcessorV1) RevertIndexedBlock(marshalledData []byte) error {
return nil
}

// FinalizedBlock will handler the finalized block event
// FinalizedBlock will handle the finalized block event
func (d *eventsPreProcessorV1) FinalizedBlock(marshalledData []byte) error {
finalizedBlock := &outport.FinalizedBlock{}
err := d.marshaller.Unmarshal(finalizedBlock, marshalledData)
Expand Down
2 changes: 1 addition & 1 deletion process/preprocess/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"github.com/multiversx/mx-chain-core-go/data/block"
)

// EmptyBlockCreatorContainer defines the behavior of a empty block creator container
// EmptyBlockCreatorContainer defines the behavior of an empty block creator container
type EmptyBlockCreatorContainer interface {
Add(headerType core.HeaderType, creator block.EmptyBlockCreator) error
Get(headerType core.HeaderType) (block.EmptyBlockCreator, error)
Expand Down
File renamed without changes.

0 comments on commit aae6c87

Please sign in to comment.