refactor(simulator): Remove capacity event

This change removes the Capacity entry from FlowEvent. Since the source
is always pulled on a capacity change, we do not need a separate event
for this.

1 files changed, 4 insertions, 6 deletions

diff --git a/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/core/SimTFDevice.kt b/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/core/SimTFDevice.kt
index 2ba65e90..6f460ef7 100644
--- a/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/core/SimTFDevice.kt
+++ b/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/core/SimTFDevice.kt
@@ -131,6 +131,8 @@ public class SimTFDevice(
         override fun onPull(conn: FlowConnection, now: Long, delta: Long): Long {
             val consumedWork = conn.rate * delta / 1000.0
 
+            capacity = conn.capacity
+
             val activeWork = activeWork
             if (activeWork != null) {
                 if (activeWork.consume(consumedWork)) {
@@ -158,12 +160,8 @@ public class SimTFDevice(
         override fun onEvent(conn: FlowConnection, now: Long, event: FlowEvent) {
             when (event) {
                 FlowEvent.Start -> {
-                    this.ctx = conn
-                    this.capacity = conn.capacity
-                }
-                FlowEvent.Capacity -> {
-                    this.capacity = conn.capacity
-                    conn.pull()
+                    ctx = conn
+                    capacity = conn.capacity
                 }
                 FlowEvent.Converge -> {
                     _usage.record(conn.rate)