[LC-219] Don't treat continuous leader complain.

icon-project · Mar 7, 2019 · c1a4070 · c1a4070
1 parent 53eac4b
commit c1a4070
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/loopchain/blockchain/epoch.py b/loopchain/blockchain/epoch.py
@@ -33,7 +33,6 @@ def __init__(self, block_manager, leader_id=None):
         else:
             self.height = 1
         self.leader_id = leader_id
-        self.next_leader_id = None
         self.__block_manager = block_manager
         self.__blockchain = self.__block_manager.get_blockchain()
         util.logger.debug(f"New Epoch Start height({self.height }) leader_id({leader_id})")

diff --git a/loopchain/channel/channel_service.py b/loopchain/channel/channel_service.py
@@ -759,6 +759,8 @@ def reset_leader_complain_timer(self):
         if timer:
             self.stop_leader_complain_timer()
             duration = min(timer.duration * 2, conf.MAX_TIMEOUT_FOR_LEADER_COMPLAIN)
+
+        # utils.logger.notice(f"reset_leader_complain_timer duration({duration})")
         self.start_leader_complain_timer(duration=duration)
 
     def start_leader_complain_timer(self, duration=None):

diff --git a/loopchain/channel/channel_statemachine.py b/loopchain/channel/channel_statemachine.py
@@ -160,10 +160,8 @@ def _blockgenerate_on_exit(self):
     def _leadercomplain_on_enter(self):
         util.logger.debug(f"_leadercomplain_on_enter")
         self.__channel_service.block_manager.leader_complain()
-        self.__channel_service.start_leader_complain_timer()
 
     def _leadercomplain_on_exit(self):
         util.logger.debug(f"_leadercomplain_on_exit")
-        self.__channel_service.stop_leader_complain_timer()
 
     # }
diff --git a/loopchain/peer/block_manager.py b/loopchain/peer/block_manager.py
@@ -691,6 +691,7 @@ def stop(self):
             self.consensus_algorithm.stop()
 
     def leader_complain(self):
+        # util.logger.notice(f"do leader complain.")
         new_leader_id = self.epoch.pop_complained_candidate_leader()
         complained_leader_id = self.epoch.leader_id