small change

forkmanager/fork.go

@@ -9,7 +9,7 @@ type HandlerDesc string
 
 // HandlerContainer keeps id of a handler and actual handler
 type HandlerContainer struct {
-	// ID is ID of a handler
+	// ID represents an auto-incremented identifier for a handler
 	ID uint
 	// Handler represents an actual event handler
 	Handler interface{}
@@ -76,8 +76,6 @@ type forkHandler struct {
 
 // forkParamsBlock encapsulates block and actual fork params
 type forkParamsBlock struct {
-	// id - if two params start from the same block number, the one with the greater ID should take precedence.
-	id uint
 	// fromBlockNumber defines block number after params should be active
 	fromBlockNumber uint64
 	// params is a pointer to fork params

forkmanager/fork_manager.go

@@ -18,7 +18,8 @@ type forkManager struct {
 	forkMap     map[string]*Fork
 	handlersMap map[HandlerDesc][]forkHandler
 	params      []forkParamsBlock
-	handlersIds map[HandlerDesc]uint
+
+	handlerIdCnt uint
 }
 
 // GeInstance returns fork manager singleton instance. Thread safe
@@ -40,7 +41,6 @@ func (fm *forkManager) Clear() {
 
 	fm.forkMap = map[string]*Fork{}
 	fm.handlersMap = map[HandlerDesc][]forkHandler{}
-	fm.handlersIds = map[HandlerDesc]uint{}
 }
 
 // RegisterFork registers fork by its name
@@ -67,10 +67,10 @@ func (fm *forkManager) RegisterHandler(forkName string, handlerName HandlerDesc,
 		return fmt.Errorf("fork does not exist: %s", forkName)
 	}
 
-	fm.handlersIds[handlerName]++
+	fm.handlerIdCnt++
 
 	fork.Handlers[handlerName] = HandlerContainer{
-		ID:      fm.handlersIds[handlerName],
+		ID:      fm.handlerIdCnt,
 		Handler: handler,
 	}
 

forkmanager/fork_manager_test.go

@@ -216,7 +216,6 @@ func TestForkManager_Deactivate(t *testing.T) {
 	forkManager := &forkManager{
 		forkMap:     map[string]*Fork{},
 		handlersMap: map[HandlerDesc][]forkHandler{},
-		handlersIds: map[HandlerDesc]uint{},
 	}
 	mvs1, mvs2 := uint64(1), uint64(2)
 
@@ -262,7 +261,6 @@ func TestForkManager_HandlerReplacement(t *testing.T) {
 	forkManager := &forkManager{
 		forkMap:     map[string]*Fork{},
 		handlersMap: map[HandlerDesc][]forkHandler{},
-		handlersIds: map[HandlerDesc]uint{},
 	}
 
 	execute := func(name HandlerDesc, block uint64) string {
@@ -300,7 +298,6 @@ func TestForkManager_HandlerPrecedence(t *testing.T) {
 	forkManager := &forkManager{
 		forkMap:     map[string]*Fork{},
 		handlersMap: map[HandlerDesc][]forkHandler{},
-		handlersIds: map[HandlerDesc]uint{},
 	}
 
 	execute := func(name HandlerDesc, block uint64) string {