[refactor]: Remove additional queue for MST

Signed-off-by: Shanin Roman <[email protected]>
Erigara · Jun 2, 2023 · 6a51c06 · 6a51c06
1 parent f407c99
commit 6a51c06
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 263 deletions.
diff --git a/config/iroha_test_config.json b/config/iroha_test_config.json
@@ -53,7 +53,6 @@
   },
   "QUEUE": {
     "MAX_TRANSACTIONS_IN_QUEUE": 65536,
-    "MAX_TRANSACTIONS_IN_SIGNATURE_BUFFER": 65536,
     "TRANSACTION_TIME_TO_LIVE_MS": 86400000,
     "FUTURE_THRESHOLD_MS": 1000
   },

diff --git a/config/src/queue.rs b/config/src/queue.rs
@@ -4,7 +4,6 @@ use iroha_config_base::derive::{Documented, Proxy};
 use serde::{Deserialize, Serialize};
 
 const DEFAULT_MAX_TRANSACTIONS_IN_QUEUE: u32 = 2_u32.pow(16);
-const DEFAULT_MAX_TRANSACTIONS_IN_SIGNATURE_BUFFER: u32 = 2_u32.pow(16);
 // 24 hours
 const DEFAULT_TRANSACTION_TIME_TO_LIVE_MS: u64 = 24 * 60 * 60 * 1000;
 const DEFAULT_FUTURE_THRESHOLD_MS: u64 = 1000;
@@ -16,8 +15,6 @@ const DEFAULT_FUTURE_THRESHOLD_MS: u64 = 1000;
 pub struct Configuration {
     /// The upper limit of the number of transactions waiting in the queue.
     pub max_transactions_in_queue: u32,
-    /// The upper limit of the number of transactions waiting for more signatures.
-    pub max_transactions_in_signature_buffer: u32,
     /// The transaction will be dropped after this time if it is still in the queue.
     pub transaction_time_to_live_ms: u64,
     /// The threshold to determine if a transaction has been tampered to have a future timestamp.
@@ -28,9 +25,6 @@ impl Default for ConfigurationProxy {
     fn default() -> Self {
         Self {
             max_transactions_in_queue: Some(DEFAULT_MAX_TRANSACTIONS_IN_QUEUE),
-            max_transactions_in_signature_buffer: Some(
-                DEFAULT_MAX_TRANSACTIONS_IN_SIGNATURE_BUFFER,
-            ),
             transaction_time_to_live_ms: Some(DEFAULT_TRANSACTION_TIME_TO_LIVE_MS),
             future_threshold_ms: Some(DEFAULT_FUTURE_THRESHOLD_MS),
         }
@@ -47,12 +41,11 @@ pub mod tests {
         pub fn arb_proxy()
             (
                 max_transactions_in_queue in prop::option::of(Just(DEFAULT_MAX_TRANSACTIONS_IN_QUEUE)),
-                max_transactions_in_signature_buffer in prop::option::of(Just(DEFAULT_MAX_TRANSACTIONS_IN_SIGNATURE_BUFFER)),
                 transaction_time_to_live_ms in prop::option::of(Just(DEFAULT_TRANSACTION_TIME_TO_LIVE_MS)),
                 future_threshold_ms in prop::option::of(Just(DEFAULT_FUTURE_THRESHOLD_MS)),
             )
             -> ConfigurationProxy {
-            ConfigurationProxy { max_transactions_in_queue, max_transactions_in_signature_buffer, transaction_time_to_live_ms, future_threshold_ms }
+            ConfigurationProxy { max_transactions_in_queue, transaction_time_to_live_ms, future_threshold_ms }
         }
     }
 }
diff --git a/configs/peer/config.json b/configs/peer/config.json
@@ -34,7 +34,6 @@
   },
   "QUEUE": {
     "MAX_TRANSACTIONS_IN_QUEUE": 65536,
-    "MAX_TRANSACTIONS_IN_SIGNATURE_BUFFER": 65536,
     "TRANSACTION_TIME_TO_LIVE_MS": 86400000,
     "FUTURE_THRESHOLD_MS": 1000
   },