Revert "refactor a bit (#7918)"

[sherry-x]

This reverts commit 41cf471.

Description

🤖 Generated by Copilot at 60254c7

No summary available (Limit exceeded: required to process {options.workListener.tokensAnalyzed} tokens, but only 50000 are allowed per call)

Test Plan

[github-actions]

✅ Forge suite compat success on testnet_2d8b1b57553d869190f61df1aaf7f31a8fc19a7b ==> 60254c79fc212a3be6e6d6516b2faa20f46cb444

Compatibility test results for testnet_2d8b1b57553d869190f61df1aaf7f31a8fc19a7b ==> 60254c79fc212a3be6e6d6516b2faa20f46cb444 (PR)
1. Check liveness of validators at old version: testnet_2d8b1b57553d869190f61df1aaf7f31a8fc19a7b
compatibility::simple-validator-upgrade::liveness-check : 7701 TPS, 4987 ms latency, 7000 ms p99 latency,no expired txns
2. Upgrading first Validator to new version: 60254c79fc212a3be6e6d6516b2faa20f46cb444
compatibility::simple-validator-upgrade::single-validator-upgrade : 4363 TPS, 9297 ms latency, 11900 ms p99 latency,no expired txns
3. Upgrading rest of first batch to new version: 60254c79fc212a3be6e6d6516b2faa20f46cb444
compatibility::simple-validator-upgrade::half-validator-upgrade : 4370 TPS, 9112 ms latency, 11400 ms p99 latency,no expired txns
4. upgrading second batch to new version: 60254c79fc212a3be6e6d6516b2faa20f46cb444
compatibility::simple-validator-upgrade::rest-validator-upgrade : 6231 TPS, 6170 ms latency, 12000 ms p99 latency,no expired txns
5. check swarm health
Compatibility test for testnet_2d8b1b57553d869190f61df1aaf7f31a8fc19a7b ==> 60254c79fc212a3be6e6d6516b2faa20f46cb444 passed
Test Ok

• Grafana dashboard
• Humio Logs
• Pyroscope Profiling
• Test runner output
• Test run is land-blocking

[github-actions]

✅ Forge suite land_blocking success on 60254c79fc212a3be6e6d6516b2faa20f46cb444

performance benchmark : 5217 TPS, 7562 ms latency, 27400 ms p99 latency,(!) expired 313 out of 2228320 txns
Test Ok

• Grafana dashboard
• Humio Logs
• Pyroscope Profiling
• Test runner output
• Test run is land-blocking

[github-actions]

✅ Forge suite framework_upgrade success on aptos-node-v1.3.0_3fc3d42b6cfe27460004f9a0326451bcda840a60 ==> 60254c79fc212a3be6e6d6516b2faa20f46cb444

Compatibility test results for aptos-node-v1.3.0_3fc3d42b6cfe27460004f9a0326451bcda840a60 ==> 60254c79fc212a3be6e6d6516b2faa20f46cb444 (PR)
Upgrade the nodes to version: 60254c79fc212a3be6e6d6516b2faa20f46cb444
framework_upgrade::framework-upgrade::full-framework-upgrade : 5943 TPS, 6637 ms latency, 9500 ms p99 latency,no expired txns
5. check swarm health
Compatibility test for aptos-node-v1.3.0_3fc3d42b6cfe27460004f9a0326451bcda840a60 ==> 60254c79fc212a3be6e6d6516b2faa20f46cb444 passed
Test Ok

• Grafana dashboard
• Humio Logs
• Pyroscope Profiling
• Test runner output
• Test run is land-blocking