Skip to content

Commit 2fa1188

Browse files
apfitzgewen-coding
authored andcommitted
bench-tps tests use bank w/ all features enabled (solana-labs#32142)
1 parent 97ea3c5 commit 2fa1188

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

bench-tps/src/bench.rs

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,15 +1111,25 @@ mod tests {
11111111
super::*,
11121112
solana_runtime::{bank::Bank, bank_client::BankClient},
11131113
solana_sdk::{
1114-
commitment_config::CommitmentConfig, fee_calculator::FeeRateGovernor,
1115-
genesis_config::create_genesis_config, native_token::sol_to_lamports, nonce::State,
1114+
commitment_config::CommitmentConfig,
1115+
feature_set::FeatureSet,
1116+
fee_calculator::FeeRateGovernor,
1117+
genesis_config::{create_genesis_config, GenesisConfig},
1118+
native_token::sol_to_lamports,
1119+
nonce::State,
11161120
},
11171121
};
11181122

1123+
fn bank_with_all_features(genesis_config: &GenesisConfig) -> Bank {
1124+
let mut bank = Bank::new_for_tests(genesis_config);
1125+
bank.feature_set = Arc::new(FeatureSet::all_enabled());
1126+
bank
1127+
}
1128+
11191129
#[test]
11201130
fn test_bench_tps_bank_client() {
11211131
let (genesis_config, id) = create_genesis_config(sol_to_lamports(10_000.0));
1122-
let bank = Bank::new_for_tests(&genesis_config);
1132+
let bank = bank_with_all_features(&genesis_config);
11231133
let client = Arc::new(BankClient::new(bank));
11241134

11251135
let config = Config {
@@ -1139,7 +1149,7 @@ mod tests {
11391149
#[test]
11401150
fn test_bench_tps_fund_keys() {
11411151
let (genesis_config, id) = create_genesis_config(sol_to_lamports(10_000.0));
1142-
let bank = Bank::new_for_tests(&genesis_config);
1152+
let bank = bank_with_all_features(&genesis_config);
11431153
let client = Arc::new(BankClient::new(bank));
11441154
let keypair_count = 20;
11451155
let lamports = 20;
@@ -1163,7 +1173,7 @@ mod tests {
11631173
let (mut genesis_config, id) = create_genesis_config(sol_to_lamports(10_000.0));
11641174
let fee_rate_governor = FeeRateGovernor::new(11, 0);
11651175
genesis_config.fee_rate_governor = fee_rate_governor;
1166-
let bank = Bank::new_for_tests(&genesis_config);
1176+
let bank = bank_with_all_features(&genesis_config);
11671177
let client = Arc::new(BankClient::new(bank));
11681178
let keypair_count = 20;
11691179
let lamports = 20;
@@ -1180,7 +1190,7 @@ mod tests {
11801190
#[test]
11811191
fn test_bench_tps_create_durable_nonce() {
11821192
let (genesis_config, id) = create_genesis_config(sol_to_lamports(10_000.0));
1183-
let bank = Bank::new_for_tests(&genesis_config);
1193+
let bank = bank_with_all_features(&genesis_config);
11841194
let client = Arc::new(BankClient::new(bank));
11851195
let keypair_count = 10;
11861196
let lamports = 10_000_000;

0 commit comments

Comments
 (0)