fix: fix merge conflicts

node/pkg/aggregator/aggregator.go

@@ -3,7 +3,6 @@ package aggregator
 import (
 	"context"
 	"encoding/json"
-	"sync"
 
 	"time"
 
@@ -97,15 +96,14 @@ func (n *Aggregator) HandleTriggerMessage(ctx context.Context, msg raft.Message)
 	defer n.cleanUpRoundData(triggerMessage.RoundID - 10)
 
 	var value int64
-	localAggregateRaw, ok := n.LatestLocalAggregates.Load(n.ID)
+	localAggregate, ok := n.LatestLocalAggregates.Load(n.ID)
 	if !ok {
 		log.Error().Str("Player", "Aggregator").Msg("failed to get latest local aggregate")
 		// set value to -1 rather than returning error
 		// it is to proceed further steps even if current node fails to get latest local aggregate
 		// if not enough messages collected from HandleSyncReplyMessage, it will hang in certain round
 		value = -1
 	} else {
-		localAggregate := localAggregateRaw.(types.LocalAggregate)
 		value = localAggregate.Value
 	}
 

node/pkg/aggregator/types.go

@@ -17,8 +17,6 @@ import (
 const (
 	AGREEMENT_QUORUM = 0.5
 
-	RoundSync raft.MessageType = "roundSync"
-	SyncReply raft.MessageType = "syncReply"
 	Trigger   raft.MessageType = "trigger"
 	PriceData raft.MessageType = "priceData"
 	ProofMsg  raft.MessageType = "proof"
@@ -69,12 +67,12 @@ type Aggregator struct {
 	Config
 	Raft *raft.Raft
 
-	LatestLocalAggregates    *LatestLocalAggregates
-	roundPrices *RoundPrices
-	roundProofs *RoundProofs
+	LatestLocalAggregates *LatestLocalAggregates
+	roundPrices           *RoundPrices
+	roundProofs           *RoundProofs
 
-	RoundID               int32
-	Signer                *helper.Signer
+	RoundID int32
+	Signer  *helper.Signer
 
 	nodeCtx    context.Context
 	nodeCancel context.CancelFunc
@@ -100,6 +98,17 @@ type TriggerMessage struct {
 	Timestamp time.Time `json:"timestamp"`
 }
 
+type LatestLocalAggregates struct {
+	LocalAggregateMap map[int32]types.LocalAggregate
+	mu                sync.RWMutex
+}
+
+func NewLatestLocalAggregates() *LatestLocalAggregates {
+	return &LatestLocalAggregates{
+		LocalAggregateMap: map[int32]types.LocalAggregate{},
+	}
+}
+
 func (r *RoundPrices) push(round int32, value int64) {
 	r.mu.Lock()
 	defer r.mu.Unlock()
@@ -172,17 +181,6 @@ func (r *RoundProofs) delete(round int32) {
 	delete(r.proofs, round)
 }
 
-type LatestLocalAggregates struct {
-	LocalAggregateMap map[int32]types.LocalAggregate
-	mu                sync.RWMutex
-}
-
-func NewLatestLocalAggregates() *LatestLocalAggregates {
-	return &LatestLocalAggregates{
-		LocalAggregateMap: map[int32]types.LocalAggregate{},
-	}
-}
-
 func (a *LatestLocalAggregates) Load(id int32) (types.LocalAggregate, bool) {
 	a.mu.RLock()
 	defer a.mu.RUnlock()