remove naming of updateMtx field to improve code readability

oracle/reactor.go

@@ -189,7 +189,7 @@ func (oracleR *Reactor) Receive(e p2p.Envelope) {
 		}
 
 		preLockTime := time.Now().UnixMilli()
-		oracleR.OracleInfo.GossipVoteBuffer.UpdateMtx.Lock()
+		oracleR.OracleInfo.GossipVoteBuffer.Lock()
 		currentGossipVote, ok := oracleR.OracleInfo.GossipVoteBuffer.Buffer[pubKey.Address().String()]
 
 		if !ok {
@@ -204,7 +204,7 @@ func (oracleR *Reactor) Receive(e p2p.Envelope) {
 				oracleR.OracleInfo.GossipVoteBuffer.Buffer[pubKey.Address().String()] = msg
 			}
 		}
-		oracleR.OracleInfo.GossipVoteBuffer.UpdateMtx.Unlock()
+		oracleR.OracleInfo.GossipVoteBuffer.Unlock()
 		postLockTime := time.Now().UnixMilli()
 		diff := postLockTime - preLockTime
 		if diff > 100 {
@@ -261,7 +261,7 @@ func (oracleR *Reactor) broadcastVoteRoutine(peer p2p.Peer) {
 		}
 
 		preLockTime := time.Now().UnixMilli()
-		oracleR.OracleInfo.GossipVoteBuffer.UpdateMtx.RLock()
+		oracleR.OracleInfo.GossipVoteBuffer.RLock()
 		votes := []*oracleproto.GossipedVotes{}
 		for _, gossipVote := range oracleR.OracleInfo.GossipVoteBuffer.Buffer {
 			// stop sending gossip votes that have passed the maxGossipVoteAge
@@ -271,7 +271,7 @@ func (oracleR *Reactor) broadcastVoteRoutine(peer p2p.Peer) {
 
 			votes = append(votes, gossipVote)
 		}
-		oracleR.OracleInfo.GossipVoteBuffer.UpdateMtx.RUnlock()
+		oracleR.OracleInfo.GossipVoteBuffer.RUnlock()
 		postLockTime := time.Now().UnixMilli()
 		diff := postLockTime - preLockTime
 		if diff > 100 {

oracle/service/runner/runner.go

@@ -53,13 +53,13 @@ func ProcessSignVoteQueue(oracleInfo *types.OracleInfo, consensusState *cs.State
 
 	// batch sign the new votes, along with existing votes in gossipVoteBuffer, if any
 	// append new batch into unsignedVotesBuffer, need to mutex lock as it will clash with concurrent pruning
-	oracleInfo.UnsignedVoteBuffer.UpdateMtx.Lock()
+	oracleInfo.UnsignedVoteBuffer.Lock()
 	oracleInfo.UnsignedVoteBuffer.Buffer = append(oracleInfo.UnsignedVoteBuffer.Buffer, votes...)
 
 	unsignedVotes := []*oracleproto.Vote{}
 	unsignedVotes = append(unsignedVotes, oracleInfo.UnsignedVoteBuffer.Buffer...)
 
-	oracleInfo.UnsignedVoteBuffer.UpdateMtx.Unlock()
+	oracleInfo.UnsignedVoteBuffer.Unlock()
 
 	// sort the votes so that we can rebuild it in a deterministic order, when uncompressing
 	SortOracleVotes(unsignedVotes)
@@ -86,10 +86,10 @@ func ProcessSignVoteQueue(oracleInfo *types.OracleInfo, consensusState *cs.State
 
 	// need to mutex lock as it will clash with concurrent gossip
 	preLockTime := time.Now().UnixMilli()
-	oracleInfo.GossipVoteBuffer.UpdateMtx.Lock()
+	oracleInfo.GossipVoteBuffer.Lock()
 	address := oracleInfo.PubKey.Address().String()
 	oracleInfo.GossipVoteBuffer.Buffer[address] = newGossipVote
-	oracleInfo.GossipVoteBuffer.UpdateMtx.Unlock()
+	oracleInfo.GossipVoteBuffer.Unlock()
 	postLockTime := time.Now().UnixMilli()
 	diff := postLockTime - preLockTime
 	if diff > 100 {
@@ -131,7 +131,7 @@ func PruneVoteBuffers(oracleInfo *types.OracleInfo, consensusState *cs.State) {
 				latestAllowableTimestamp = oracleInfo.BlockTimestamps[0]
 			}
 
-			oracleInfo.UnsignedVoteBuffer.UpdateMtx.Lock()
+			oracleInfo.UnsignedVoteBuffer.Lock()
 			newVotes := []*oracleproto.Vote{}
 			unsignedVoteBuffer := oracleInfo.UnsignedVoteBuffer.Buffer
 			visitedVoteMap := make(map[string]struct{})
@@ -160,10 +160,10 @@ func PruneVoteBuffers(oracleInfo *types.OracleInfo, consensusState *cs.State) {
 				}
 			}
 			oracleInfo.UnsignedVoteBuffer.Buffer = newVotes
-			oracleInfo.UnsignedVoteBuffer.UpdateMtx.Unlock()
+			oracleInfo.UnsignedVoteBuffer.Unlock()
 
 			preLockTime := time.Now().UnixMilli()
-			oracleInfo.GossipVoteBuffer.UpdateMtx.Lock()
+			oracleInfo.GossipVoteBuffer.Lock()
 			gossipBuffer := oracleInfo.GossipVoteBuffer.Buffer
 
 			// prune gossipedVotes that are older than the latestAllowableTimestamp, which is the max(earliest block timestamp collected, current time - maxOracleGossipAge)
@@ -173,7 +173,7 @@ func PruneVoteBuffers(oracleInfo *types.OracleInfo, consensusState *cs.State) {
 				}
 			}
 			oracleInfo.GossipVoteBuffer.Buffer = gossipBuffer
-			oracleInfo.GossipVoteBuffer.UpdateMtx.Unlock()
+			oracleInfo.GossipVoteBuffer.Unlock()
 			postLockTime := time.Now().UnixMilli()
 			diff := postLockTime - preLockTime
 			if diff > 100 {

oracle/service/types/info.go

@@ -22,13 +22,13 @@ type OracleInfo struct {
 	BlockTimestamps    []int64
 }
 type GossipVoteBuffer struct {
-	Buffer    map[string]*oracleproto.GossipedVotes
-	UpdateMtx cmtsync.RWMutex
+	Buffer map[string]*oracleproto.GossipedVotes
+	cmtsync.RWMutex
 }
 
 type UnsignedVoteBuffer struct {
-	Buffer    []*oracleproto.Vote
-	UpdateMtx cmtsync.RWMutex
+	Buffer []*oracleproto.Vote
+	cmtsync.RWMutex
 }
 
 var MainAccountSigPrefix = []byte{0x00}

state/execution.go

@@ -169,13 +169,13 @@ func (blockExec *BlockExecutor) CreateProposalBlock(
 
 	// check if oracle's gossipVoteMap has any results
 	preLockTime := time.Now().UnixMilli()
-	blockExec.oracleInfo.GossipVoteBuffer.UpdateMtx.RLock()
+	blockExec.oracleInfo.GossipVoteBuffer.RLock()
 	oracleVotesBuffer := blockExec.oracleInfo.GossipVoteBuffer.Buffer
 	votes := []*oracleproto.GossipedVotes{}
 	for _, vote := range oracleVotesBuffer {
 		votes = append(votes, vote)
 	}
-	blockExec.oracleInfo.GossipVoteBuffer.UpdateMtx.RUnlock()
+	blockExec.oracleInfo.GossipVoteBuffer.RUnlock()
 	postLockTime := time.Now().UnixMilli()
 	diff := postLockTime - preLockTime
 	if diff > 100 {