Fixed TPS benchmark to work with latest changes

Cargo.toml

@@ -41,6 +41,11 @@ exclude = ["version-compatibility"]
 [profile.release]
 codegen-units = 1
 lto = "fat"
+# The difference in performance for "fat" and "thin" is small,
+# but "thin" LTO is much faster to compile.
+# If you play with benchamrks or flamegraph, it is better to use "thin"
+# To speedup iterations between compialtion.
+#lto = "thin"
 panic = "unwind"
 
 [workspace.package]

benches/benches/transaction_throughput.rs

@@ -1,4 +1,5 @@
 //! Tests throughput of various transaction types
+//! `cargo bench --bench transaction_throughput -p fuel-core-benches`
 
 use criterion::{
     criterion_group,
@@ -90,6 +91,7 @@ where
             test_builder.utxo_validation = true;
             test_builder.gas_limit = Some(10_000_000_000);
             test_builder.block_size_limit = Some(1_000_000_000_000);
+            test_builder.max_txs = 100000;
 
             // spin up node
             let transactions: Vec<Transaction> =

crates/fuel-core/Cargo.toml

@@ -71,7 +71,11 @@ uuid = { version = "1.1", features = ["v4"] }
 [dev-dependencies]
 assert_matches = "1.5"
 fuel-core = { path = ".", features = ["smt", "test-helpers"] }
-fuel-core-executor = { workspace = true, features = ["std", "test-helpers"] }
+fuel-core-executor = { workspace = true, features = [
+  "std",
+  "test-helpers",
+  "limited-tx-count",
+] }
 fuel-core-services = { path = "./../services", features = ["test-helpers"] }
 fuel-core-storage = { path = "./../storage", features = ["test-helpers"] }
 fuel-core-trace = { path = "./../trace" }

crates/services/executor/Cargo.toml

@@ -36,3 +36,4 @@ test-helpers = [
   "fuel-core-types/test-helpers",
   "fuel-core-storage/test-helpers",
 ]
+limited-tx-count = []

crates/services/executor/src/executor.rs

@@ -164,11 +164,11 @@ use alloc::{
 
 /// The maximum amount of transactions that can be included in a block,
 /// excluding the mint transaction.
-#[cfg(not(feature = "test-helpers"))]
+#[cfg(not(feature = "limited-tx-count"))]
 pub const fn max_tx_count() -> u16 {
     u16::MAX.saturating_sub(1)
 }
-#[cfg(feature = "test-helpers")]
+#[cfg(feature = "limited-tx-count")]
 pub const fn max_tx_count() -> u16 {
     1024
 }

crates/services/upgradable-executor/Cargo.toml

@@ -59,3 +59,4 @@ test-helpers = [
   "fuel-core-storage/test-helpers",
   "fuel-core-types/test-helpers",
 ]
+limited-tx-count = ["fuel-core-executor/limited-tx-count"]

tests/Cargo.toml

@@ -37,7 +37,6 @@ fuel-core-benches = { path = "../benches" }
 fuel-core-bin = { path = "../bin/fuel-core", features = ["parquet", "p2p"] }
 fuel-core-client = { path = "../crates/client", features = ["test-helpers"] }
 fuel-core-compression = { path = "../crates/compression" }
-fuel-core-executor = { workspace = true, features = ["test-helpers"] }
 fuel-core-gas-price-service = { path = "../crates/services/gas_price_service" }
 fuel-core-p2p = { path = "../crates/services/p2p", features = [
   "test-helpers",
@@ -76,6 +75,7 @@ tokio = { workspace = true, features = [
 ] }
 
 [dev-dependencies]
+fuel-core-executor = { workspace = true, features = ["limited-tx-count"] }
 pretty_assertions = "1.4"
 proptest = { workspace = true }
 tracing = { workspace = true }

tests/test-helpers/src/builder.rs

@@ -99,6 +99,7 @@ pub struct TestSetupBuilder {
     pub privileged_address: Address,
     pub base_asset_id: AssetId,
     pub trigger: Trigger,
+    pub max_txs: usize,
 }
 
 impl TestSetupBuilder {
@@ -231,9 +232,18 @@ impl TestSetupBuilder {
             ..StateConfig::default()
         };
 
+        let mut txpool = fuel_core_txpool::config::Config::default();
+        txpool.pool_limits.max_txs = self.max_txs;
+        txpool.max_tx_update_subscriptions = self.max_txs;
+        txpool.service_channel_limits = fuel_core_txpool::config::ServiceChannelLimits {
+            max_pending_write_pool_requests: self.max_txs,
+            max_pending_read_pool_requests: self.max_txs,
+        };
+        txpool.heavy_work.size_of_verification_queue = self.max_txs;
+
         let config = Config {
             utxo_validation: self.utxo_validation,
-            txpool: fuel_core_txpool::config::Config::default(),
+            txpool,
             block_production: self.trigger,
             starting_gas_price: self.starting_gas_price,
             ..Config::local_node_with_configs(chain_conf, state)
@@ -265,6 +275,7 @@ impl Default for TestSetupBuilder {
             privileged_address: Default::default(),
             base_asset_id: AssetId::BASE,
             trigger: Trigger::Instant,
+            max_txs: 100000,
         }
     }
 }