sim-rs: give every Generated message a size_bytes

Author: SupernaviX

data/simulation/example.rust.jsonl

@@ -62,7 +62,7 @@ interface RustBlockEvent extends Omit<RustBaseEvent, "message"> {
         type: RustBlockMessageType;
         index?: number;
         header_bytes?: number;
-        total_bytes?: number;
+        size_bytes?: number;
         transactions?: string[];
         vrf?: number;
         endorsement?: any;

data/simulation/trace.rust.d.ts

@@ -74,7 +74,7 @@
                   },
                   "type": "object"
                 },
-                "total_bytes": {
+                "size_bytes": {
                   "type": "number"
                 },
                 "transactions": {

data/simulation/trace.rust.schema.json

@@ -177,8 +177,8 @@ impl EventMonitor {
                 Event::CpuTaskScheduled { .. } => {}
                 Event::CpuTaskFinished { .. } => {}
                 Event::CpuSubtaskStarted { .. } => {}
-                Event::TransactionGenerated { id, bytes, .. } => {
-                    txs.insert(id, Transaction::new(bytes, time));
+                Event::TransactionGenerated { id, size_bytes, .. } => {
+                    txs.insert(id, Transaction::new(size_bytes, time));
                     pending_txs.insert(id);
                 }
                 Event::TransactionSent { .. } => {
@@ -256,7 +256,7 @@ impl EventMonitor {
                 Event::IBGenerated {
                     id,
                     header_bytes,
-                    total_bytes,
+                    size_bytes,
                     transactions,
                     ..
                 } => {
@@ -266,7 +266,7 @@ impl EventMonitor {
                     }
                     pending_ibs.insert(id.clone());
                     ib_txs.insert(id.clone(), transactions.clone());
-                    bytes_in_ib.insert(id.clone(), total_bytes as f64);
+                    bytes_in_ib.insert(id.clone(), size_bytes as f64);
                     let mut tx_bytes = header_bytes;
                     for tx_id in &transactions {
                         *txs_in_ib.entry(id.clone()).or_default() += 1.;

sim-rs/sim-cli/src/events.rs

@@ -82,7 +82,7 @@ pub enum Event {
     TransactionGenerated {
         id: TransactionId,
         publisher: Node,
-        bytes: u64,
+        size_bytes: u64,
     },
     TransactionSent {
         id: TransactionId,
@@ -106,6 +106,7 @@ pub enum Event {
         vrf: u64,
         parent: Option<BlockId<Node>>,
         header_bytes: u64,
+        size_bytes: u64,
         endorsement: Option<Endorsement<Node>>,
         transactions: Vec<TransactionId>,
     },
@@ -137,7 +138,7 @@ pub enum Event {
         producer: Node,
         index: u64,
         header_bytes: u64,
-        total_bytes: u64,
+        size_bytes: u64,
         transactions: Vec<TransactionId>,
     },
     IBSent {
@@ -169,7 +170,7 @@ pub enum Event {
         slot: u64,
         pipeline: u64,
         producer: Node,
-        bytes: u64,
+        size_bytes: u64,
         input_blocks: Vec<InputBlockId<Node>>,
         endorser_blocks: Vec<EndorserBlockId<Node>>,
     },
@@ -200,7 +201,7 @@ pub enum Event {
         slot: u64,
         pipeline: u64,
         producer: Node,
-        bytes: u64,
+        size_bytes: u64,
         votes: Votes<Node>,
     },
     VTBundleNotGenerated {
@@ -322,9 +323,10 @@ impl EventTracker {
             vrf: block.vrf,
             parent: block.parent.map(|id| self.to_block(id)),
             header_bytes: block.header_bytes,
+            size_bytes: block.bytes(),
             endorsement: block.endorsement.as_ref().map(|e| Endorsement {
                 eb: self.to_endorser_block(e.eb),
-                bytes: e.bytes,
+                size_bytes: e.size_bytes,
                 votes: e
                     .votes
                     .iter()
@@ -359,7 +361,7 @@ impl EventTracker {
         self.send(Event::TransactionGenerated {
             id: transaction.id,
             publisher: self.to_node(publisher),
-            bytes: transaction.bytes,
+            size_bytes: transaction.bytes,
         });
     }
 
@@ -397,7 +399,7 @@ impl EventTracker {
             producer: self.to_node(block.header.id.producer),
             index: block.header.id.index,
             header_bytes: block.header.bytes,
-            total_bytes: block.header.bytes
+            size_bytes: block.header.bytes
                 + block.transactions.iter().map(|tx| tx.bytes).sum::<u64>(),
             transactions: block.transactions.iter().map(|tx| tx.id).collect(),
         });
@@ -442,7 +444,7 @@ impl EventTracker {
             slot: block.slot,
             pipeline: block.pipeline,
             producer: self.to_node(block.producer),
-            bytes: block.bytes,
+            size_bytes: block.bytes,
             input_blocks: block
                 .ibs
                 .iter()
@@ -493,7 +495,7 @@ impl EventTracker {
             slot: votes.id.slot,
             pipeline: votes.id.pipeline,
             producer: self.to_node(votes.id.producer),
-            bytes: votes.bytes,
+            size_bytes: votes.bytes,
             votes: Votes(
                 votes
                     .ebs

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

@@ -78,7 +78,7 @@ impl Block {
             + self
                 .endorsement
                 .as_ref()
-                .map(|e| e.bytes)
+                .map(|e| e.size_bytes)
                 .unwrap_or_default()
             + self.transactions.iter().map(|t| t.bytes).sum::<u64>()
     }
@@ -219,6 +219,6 @@ pub enum NoVoteReason {
 #[derive(Clone, Debug, Serialize)]
 pub struct Endorsement<Node: Display = NodeId> {
     pub eb: EndorserBlockId<Node>,
-    pub bytes: u64,
+    pub size_bytes: u64,
     pub votes: BTreeMap<Node, usize>,
 }

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

@@ -789,11 +789,11 @@ impl Node {
         };
 
         let votes = self.leios.votes_by_eb.get(&block)?.clone();
-        let bytes = self.sim_config.sizes.cert(votes.len());
+        let size_bytes = self.sim_config.sizes.cert(votes.len());
 
         Some(Endorsement {
             eb: block,
-            bytes,
+            size_bytes,
             votes,
         })
     }