sim-rs: remove tx-sharded-fraction setting

Author: SupernaviX

data/simulation/config.d.ts

@@ -63,11 +63,6 @@ export interface Config {
   "tx-generation-distribution": Distribution;
   /** Only supported by Rust simulation. */
   "tx-size-bytes-distribution": Distribution;
-  /**
-   * What fraction of transactions have at least one sharded input?
-   * 
-   * Only supported by Rust simulation. */
-  "tx-sharded-fraction": number;
   /** Only supported by Rust simulation. */
   "tx-validation-cpu-time-ms": number;
   /** Only supported by Rust simulation. */

data/simulation/config.default.yaml

@@ -44,7 +44,6 @@ tx-size-bytes-distribution:
   distribution: log-normal
   mu: 6.833
   sigma: 1.127
-tx-sharded-fraction: 0.5
 tx-validation-cpu-time-ms: 1.5
 tx-max-size-bytes: 16384
 

data/simulation/config.schema.json

@@ -353,10 +353,6 @@
       "properties": {},
       "type": "number"
     },
-    "tx-sharded-fraction": {
-      "description": "What fraction of transactions have at least one sharded input?\n\nOnly supported by Rust simulation.",
-      "type": "number"
-    },
     "tx-size-bytes-distribution": {
       "$ref": "#/definitions/Distribution",
       "description": "Only supported by Rust simulation."

sim-rs/sim-core/src/config.rs

@@ -68,7 +68,6 @@ pub struct RawParameters {
     // Transaction configuration
     pub tx_generation_distribution: DistributionConfig,
     pub tx_size_bytes_distribution: DistributionConfig,
-    pub tx_sharded_fraction: f64,
     pub tx_validation_cpu_time_ms: f64,
     pub tx_max_size_bytes: u64,
     pub tx_start_time: Option<f64>,
@@ -379,7 +378,6 @@ impl TransactionConfig {
         if params.simulate_transactions {
             Self::Real(RealTransactionConfig {
                 max_size: params.tx_max_size_bytes,
-                sharded_fraction: params.tx_sharded_fraction,
                 frequency_ms: params.tx_generation_distribution.into(),
                 size_bytes: params.tx_size_bytes_distribution.into(),
                 start_time: params
@@ -402,7 +400,6 @@ impl TransactionConfig {
 #[derive(Debug, Clone)]
 pub(crate) struct RealTransactionConfig {
     pub max_size: u64,
-    pub sharded_fraction: f64,
     pub frequency_ms: FloatDistribution,
     pub size_bytes: FloatDistribution,
     pub start_time: Option<Timestamp>,

sim-rs/sim-core/src/events.rs

@@ -102,7 +102,7 @@ pub enum Event {
         id: TransactionId,
         publisher: Node,
         size_bytes: u64,
-        shard: Option<u64>,
+        shard: u64,
     },
     TXSent {
         id: TransactionId,

sim-rs/sim-core/src/model.rs

@@ -89,7 +89,7 @@ id_wrapper!(TransactionId, u64);
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Transaction {
     pub id: TransactionId,
-    pub shard: Option<u64>,
+    pub shard: u64,
     pub bytes: u64,
 }
 

sim-rs/sim-core/src/sim/node.rs

@@ -748,7 +748,7 @@ impl Node {
                 // Add one transaction, the right size for the extra RB payload
                 let tx = Transaction {
                     id: config.next_id(),
-                    shard: None,
+                    shard: 0,
                     bytes: config.rb_size,
                 };
                 self.tracker.track_transaction_generated(&tx, self.id);
@@ -1357,16 +1357,13 @@ impl Node {
         if let TransactionConfig::Mock(config) = &self.sim_config.transactions {
             let tx = Transaction {
                 id: config.next_id(),
-                shard: None,
+                shard,
                 bytes: config.ib_size,
             };
             self.tracker.track_transaction_generated(&tx, self.id);
             vec![Arc::new(tx)]
         } else {
-            self.select_txs(
-                |seen| seen.tx.shard.is_none_or(|s| s == shard),
-                self.sim_config.max_ib_size,
-            )
+            self.select_txs(|seen| seen.tx.shard == shard, self.sim_config.max_ib_size)
         }
     }
 

sim-rs/sim-core/src/sim/tx.rs

@@ -55,9 +55,7 @@ impl TransactionProducer {
 
         loop {
             let id = TransactionId::new(next_tx_id);
-            let shard = rng
-                .random_bool(config.sharded_fraction)
-                .then(|| rng.random_range(0..self.ib_shards));
+            let shard = rng.random_range(0..self.ib_shards);
             let bytes = (config.size_bytes.sample(&mut rng) as u64).min(config.max_size);
             let tx = Transaction { id, shard, bytes };