enable-able

consensus/src/transaction_shuffler/mod.rs

@@ -62,5 +62,15 @@ pub fn create_transaction_shuffler(
                 entry_fun_conflict_window_size: entry_fun_conflict_window_size as usize,
             })
         },
+        UseCaseAware { sender_spread_factor, platform_use_case_spread_factor, user_use_case_spread_factor } => {
+            info!("Using use case aware transaction shuffling");
+            Arc::new(use_case_aware::UseCaseAwareShuffler {
+                config: use_case_aware::Config {
+                    sender_spread_factor,
+                    platform_use_case_spread_factor,
+                    user_use_case_spread_factor,
+                }
+            })
+        },
     }
 }

consensus/src/transaction_shuffler/use_case_aware/iterator.rs

@@ -80,12 +80,11 @@ where
         }
 
         // 3. If nothing is ready, return the next eligible from the delay queue
-        let ret = self.delayed_queue.pop_head(false);
+        self.delayed_queue.pop_head(false)
         // println!(
         //     "--- {}: force select head {:?} from the delay queue",
         //     self.output_idx, ret
         // );
-        ret
     }
 }
 

consensus/src/transaction_shuffler/use_case_aware/mod.rs

@@ -15,9 +15,9 @@ mod tests;
 
 #[derive(Clone, Debug, Default)]
 pub(crate) struct Config {
-    sender_spread_factor: usize,
-    platform_use_case_spread_factor: usize,
-    user_use_case_spread_factor: usize,
+    pub sender_spread_factor: usize,
+    pub platform_use_case_spread_factor: usize,
+    pub user_use_case_spread_factor: usize,
 }
 
 impl Config {
@@ -34,7 +34,13 @@ impl Config {
 }
 
 pub struct UseCaseAwareShuffler {
-    config: Config,
+    pub config: Config,
+}
+
+impl UseCaseAwareShuffler {
+    pub fn new(config: Config) -> Self {
+        Self { config }
+    }
 }
 
 impl TransactionShuffler for UseCaseAwareShuffler {

types/src/on_chain_config/execution_config.rs

@@ -153,6 +153,11 @@ pub enum TransactionShufflerType {
         module_conflict_window_size: u32,
         entry_fun_conflict_window_size: u32,
     },
+    UseCaseAware {
+        sender_spread_factor: usize,
+        platform_use_case_spread_factor: usize,
+        user_use_case_spread_factor: usize,
+    },
 }
 
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]