Remove 'propose_timeout' from the config

barabadzhi · Jul 18, 2017 · ed46892 · ed46892
1 parent 8f50089
commit ed46892
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 15 deletions.
diff --git a/exonum/src/blockchain/config.rs b/exonum/src/blockchain/config.rs
@@ -60,8 +60,6 @@ pub struct ConsensusConfig {
     pub status_timeout: Milliseconds,
     /// Peer exchange timeout.
     pub peers_timeout: Milliseconds,
-    /// Proposal timeout after committing a block.
-    pub propose_timeout: Milliseconds,
     /// Maximum number of transactions per block.
     pub txs_block_limit: u32,
     /// `TimeoutAdjuster` configuration.
@@ -72,7 +70,6 @@ impl Default for ConsensusConfig {
     fn default() -> Self {
         ConsensusConfig {
             round_timeout: 3000,
-            propose_timeout: 500,
             status_timeout: 5000,
             peers_timeout: 10000,
             txs_block_limit: 1000,

diff --git a/exonum/src/helpers/fabric/builder.rs b/exonum/src/helpers/fabric/builder.rs
@@ -65,7 +65,6 @@ impl NodeBuilder {
         T: Into<OsString> + Clone,
     {
         ClapBackend::execute_cmd_string(self.commands.as_slice(), cmd_line) != Feedback::None
-
     }
 
     /// Parse cmd args, return `Node`, if run command found

diff --git a/exonum/src/helpers/fabric/details.rs b/exonum/src/helpers/fabric/details.rs
@@ -256,7 +256,6 @@ impl Command for GenerateNodeConfig {
             "expected secret config path",
         );
 
-
         let addr = Self::addr(&context);
         let common: CommonConfigTemplate =
             ConfigFile::load(&common_config_path).expect("Could not load common config");
@@ -289,7 +288,7 @@ impl Command for GenerateNodeConfig {
             node: node_pub_config,
             common: common,
         };
-        // save public config seperately
+        // Save public config separately.
         ConfigFile::save(&shared_config, &pub_config_path).expect(
             "Could not write public config file.",
         );

diff --git a/exonum/src/node/mod.rs b/exonum/src/node/mod.rs
@@ -292,11 +292,6 @@ where
         &self.api_state
     }
 
-    /// Returns value of the `propose_timeout` field from the current `ConsensusConfig`.
-    pub fn propose_timeout(&self) -> Milliseconds {
-        self.state().consensus_config().propose_timeout
-    }
-
     /// Returns value of the `round_timeout` field from the current `ConsensusConfig`.
     pub fn round_timeout(&self) -> Milliseconds {
         self.state().consensus_config().round_timeout

diff --git a/exonum/src/node/timeout_adjuster.rs b/exonum/src/node/timeout_adjuster.rs
@@ -54,7 +54,7 @@ pub trait TimeoutAdjuster: Send + Debug {
     fn adjust_timeout(&mut self, view: &Snapshot) -> Milliseconds;
 }
 
-/// `Adjuster` implementation that returns value of `propose_timeout` field from `ConsensusConfig`.
+/// `Adjuster` implementation that always returns the same value.
 #[derive(Debug)]
 pub struct Constant {
     timeout: Milliseconds,

diff --git a/exonum/tests/config.rs b/exonum/tests/config.rs
@@ -128,7 +128,6 @@ fn run_node(config: &str, folder: &str) {
     ]));
 }
 
-
 #[test]
 fn test_generate_template() {
     let command = "generate-template";
@@ -161,7 +160,6 @@ fn test_generate_config() {
     }
 }
 
-
 #[test]
 #[cfg_attr(feature = "cargo-clippy", allow(needless_range_loop))]
 fn test_generate_full_config_run() {

diff --git a/exonum/tests/testdata/config/template.toml b/exonum/tests/testdata/config/template.toml
@@ -1,8 +1,11 @@
 [consensus_config]
 peers_timeout = 10000
-propose_timeout = 500
 round_timeout = 3000
 status_timeout = 5000
 txs_block_limit = 1000
 
+[consensus_config.timeout_adjuster]
+type = "Constant"
+timeout = 500
+
 [services_config]