Add flag to disable reseal timer

Author: Hyunsik Jeong

codechain/codechain.yml

@@ -192,6 +192,12 @@ args:
         takes_value: true
         conflicts_with:
             - no-miner
+    - no-reseal-timer:
+        long: no-reseal-timer
+        help: Do not use reseal timer.
+        takes_value: false
+        conflicts_with:
+            - no-miner
     - work-queue-size:
         long: work-queue-size
         value_name: ITEMS

codechain/config/mod.rs

@@ -83,6 +83,7 @@ impl Config {
             reseal_on_external_parcel,
             reseal_min_period: Duration::from_millis(self.mining.reseal_min_period.unwrap()),
             reseal_max_period: Duration::from_millis(self.mining.reseal_max_period.unwrap()),
+            no_reseal_timer: self.mining.no_reseal_timer.unwrap(),
             work_queue_size: self.mining.work_queue_size.unwrap(),
         })
     }
@@ -218,6 +219,7 @@ pub struct Mining {
     pub reseal_on_txs: Option<String>,
     pub reseal_min_period: Option<u64>,
     pub reseal_max_period: Option<u64>,
+    pub no_reseal_timer: Option<bool>,
     pub work_queue_size: Option<usize>,
 }
 
@@ -375,6 +377,9 @@ impl Mining {
         if other.reseal_max_period.is_some() {
             self.reseal_max_period = other.reseal_max_period;
         }
+        if other.no_reseal_timer.is_some() {
+            self.no_reseal_timer = other.no_reseal_timer;
+        }
         if other.work_queue_size.is_some() {
             self.work_queue_size = other.work_queue_size;
         }
@@ -412,6 +417,9 @@ impl Mining {
         if let Some(reseal_max_period) = matches.value_of("reseal-max-period") {
             self.reseal_max_period = Some(reseal_max_period.parse().map_err(|_| "Invalid period")?);
         }
+        if matches.is_present("no-reseal-timer") {
+            self.no_reseal_timer = Some(true);
+        }
         if let Some(work_queue_size) = matches.value_of("work-queue-size") {
             self.work_queue_size = Some(work_queue_size.parse().map_err(|_| "Invalid size")?);
         }

codechain/config/presets/config.dev.toml

@@ -13,6 +13,7 @@ force_sealing = false
 reseal_on_txs = "all"
 reseal_min_period = 0
 reseal_max_period = 120000
+no_reseal_timer = false
 work_queue_size = 20
 
 [network]

codechain/config/presets/config.prod.toml

@@ -12,6 +12,7 @@ force_sealing = true
 reseal_on_txs = "all"
 reseal_min_period = 4000
 reseal_max_period = 120000
+no_reseal_timer = false
 work_queue_size = 20
 
 [network]

core/src/miner/miner.rs

@@ -62,6 +62,8 @@ pub struct MinerOptions {
     pub reseal_min_period: Duration,
     /// Maximum period between blocks (enables force sealing after that).
     pub reseal_max_period: Duration,
+    /// Disable the reseal timer
+    pub no_reseal_timer: bool,
     /// Maximum size of the mem pool.
     pub mem_pool_size: usize,
     /// Maximum memory usage of parcels in the queue (current / future).
@@ -79,6 +81,7 @@ impl Default for MinerOptions {
             reseal_on_own_parcel: true,
             reseal_min_period: Duration::from_secs(2),
             reseal_max_period: Duration::from_secs(120),
+            no_reseal_timer: false,
             mem_pool_size: 8192,
             mem_pool_memory_limit: Some(2 * 1024 * 1024),
             work_queue_size: 20,
@@ -746,13 +749,17 @@ impl MinerService for Miner {
                     self.prepare_work(block, original_work_hash);
                     // Set the reseal max timer, for creating empty blocks every reseal_max_period
                     // Not related to next_mandatory_reseal, which is used in seal_and_import_block_internally
-                    chain.set_max_timer();
+                    if !self.options.no_reseal_timer {
+                        chain.set_max_timer();
+                    }
                 }
             }
 
             // Sealing successful
             *self.next_allowed_reseal.lock() = Instant::now() + self.options.reseal_min_period;
-            chain.set_min_timer();
+            if !self.options.no_reseal_timer {
+                chain.set_min_timer();
+            }
         }
     }