From 0a5c047600056704322d5b3d6b1549d62619ee37 Mon Sep 17 00:00:00 2001
From: Liam <ic09272002@yahoo.com.tw>
Date: Sat, 4 Sep 2021 17:51:32 +1000
Subject: [PATCH] remove duplicate update m1 call (#8)

---
 core/blockchain.go | 3 +--
 miner/worker.go    | 9 ---------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/core/blockchain.go b/core/blockchain.go
index 738b914b9e..c81ac1b7e0 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -1071,8 +1071,7 @@ func (bc *BlockChain) WriteBlockWithState(block *types.Block, receipts []*types.
 		if bc.chainConfig.XDPoS != nil && ((block.NumberU64() % bc.chainConfig.XDPoS.Epoch) == (bc.chainConfig.XDPoS.Epoch - bc.chainConfig.XDPoS.Gap)) {
 			err := bc.UpdateM1()
 			if err != nil {
-				log.Error("Error when update masternodes set. Stopping node", "err", err)
-				os.Exit(1)
+				log.Crit("Error when update masternodes set. Stopping node", "err", err)
 			}
 		}
 	}
diff --git a/miner/worker.go b/miner/worker.go
index cb471e9d6b..3839e386c2 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -21,7 +21,6 @@ import (
 	"encoding/binary"
 	"errors"
 	"math/big"
-	"os"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -621,14 +620,6 @@ func (w *worker) resultLoop() {
 				if (block.NumberU64() % w.config.XDPoS.Epoch) == 0 {
 					core.CheckpointCh <- 1
 				}
-				// prepare set of masternodes for the next epoch
-				if (block.NumberU64() % w.config.XDPoS.Epoch) == (w.config.XDPoS.Epoch - w.config.XDPoS.Gap) {
-					err := w.chain.UpdateM1()
-					if err != nil {
-						log.Error("Error when update masternodes set. Stopping node", "err", err)
-						os.Exit(1)
-					}
-				}
 			}
 			w.chain.PostChainEvents(events, logs)