fix conflict

potuz · potuz · commit 9d9d0e329f54 · 2023-01-28T14:57:10.000+01:00
diff --git a/beacon-chain/operations/blstoexec/pool.go b/beacon-chain/operations/blstoexec/pool.go
@@ -46,7 +46,7 @@ func NewPool() *Pool {
 
 // Copies the internal map and returns a new one.
 func (p *Pool) cycleMap() {
-	newMap := make(map[types.ValidatorIndex]*doublylinkedlist.Node[*ethpb.SignedBLSToExecutionChange])
+	newMap := make(map[primitives.ValidatorIndex]*doublylinkedlist.Node[*ethpb.SignedBLSToExecutionChange])
 	for k, v := range p.m {
 		newMap[k] = v
 	}

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func NewPool() *Pool {`
`46`	`46`
`47`	`47`	`// Copies the internal map and returns a new one.`
`48`	`48`	`func (p *Pool) cycleMap() {`
`49`		`- newMap := make(map[types.ValidatorIndex]doublylinkedlist.Node[ethpb.SignedBLSToExecutionChange])`
	`49`	`+ newMap := make(map[primitives.ValidatorIndex]doublylinkedlist.Node[ethpb.SignedBLSToExecutionChange])`
`50`	`50`	`for k, v := range p.m {`
`51`	`51`	`newMap[k] = v`
`52`	`52`	`}`