Skip to content

Commit 6291470

Browse files
dev-jodeedev-jodee
committed
Commitment level consistency
1 parent 94727b6 commit 6291470

File tree

6 files changed

+65
-18
lines changed

6 files changed

+65
-18
lines changed

‎crates/lib/src/validator/config_validator.rs‎

Lines changed: 48 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,10 @@ mod tests {
385385
config.validation.allowed_tokens = vec![];
386386
let _ = update_config(config);
387387

388-
let rpc_client = RpcClient::new("http://localhost:8899".to_string());
388+
let rpc_client = RpcClient::new_with_commitment(
389+
"http://localhost:8899".to_string(),
390+
CommitmentConfig::confirmed(),
391+
);
389392
let result = ConfigValidator::validate(&rpc_client).await;
390393
assert!(result.is_err());
391394
assert!(matches!(result.unwrap_err(), KoraError::InternalServerError(_)));
@@ -419,7 +422,10 @@ mod tests {
419422
// Initialize global config
420423
let _ = update_config(config);
421424

422-
let rpc_client = RpcClient::new("http://localhost:8899".to_string());
425+
let rpc_client = RpcClient::new_with_commitment(
426+
"http://localhost:8899".to_string(),
427+
CommitmentConfig::confirmed(),
428+
);
423429
let result = ConfigValidator::validate_with_result(&rpc_client, true).await;
424430
assert!(result.is_ok());
425431
let warnings = result.unwrap();
@@ -467,7 +473,10 @@ mod tests {
467473
// Initialize global config
468474
let _ = update_config(config);
469475

470-
let rpc_client = RpcClient::new("http://localhost:8899".to_string());
476+
let rpc_client = RpcClient::new_with_commitment(
477+
"http://localhost:8899".to_string(),
478+
CommitmentConfig::confirmed(),
479+
);
471480
let result = ConfigValidator::validate_with_result(&rpc_client, true).await;
472481
assert!(result.is_ok());
473482
let warnings = result.unwrap();
@@ -504,7 +513,10 @@ mod tests {
504513
// Initialize global config
505514
let _ = update_config(config);
506515

507-
let rpc_client = RpcClient::new("http://localhost:8899".to_string());
516+
let rpc_client = RpcClient::new_with_commitment(
517+
"http://localhost:8899".to_string(),
518+
CommitmentConfig::confirmed(),
519+
);
508520
let result = ConfigValidator::validate_with_result(&rpc_client, true).await;
509521
assert!(result.is_ok());
510522
let warnings = result.unwrap();
@@ -539,7 +551,10 @@ mod tests {
539551

540552
let _ = update_config(config);
541553

542-
let rpc_client = RpcClient::new("http://localhost:8899".to_string());
554+
let rpc_client = RpcClient::new_with_commitment(
555+
"http://localhost:8899".to_string(),
556+
CommitmentConfig::confirmed(),
557+
);
543558
let result = ConfigValidator::validate_with_result(&rpc_client, true).await;
544559
assert!(result.is_err());
545560
let errors = result.unwrap_err();
@@ -579,7 +594,10 @@ mod tests {
579594

580595
let _ = update_config(config);
581596

582-
let rpc_client = RpcClient::new("http://localhost:8899".to_string());
597+
let rpc_client = RpcClient::new_with_commitment(
598+
"http://localhost:8899".to_string(),
599+
CommitmentConfig::confirmed(),
600+
);
583601
let result = ConfigValidator::validate_with_result(&rpc_client, true).await;
584602
assert!(result.is_err());
585603
let errors = result.unwrap_err();
@@ -616,7 +634,10 @@ mod tests {
616634

617635
let _ = update_config(config);
618636

619-
let rpc_client = RpcClient::new("http://localhost:8899".to_string());
637+
let rpc_client = RpcClient::new_with_commitment(
638+
"http://localhost:8899".to_string(),
639+
CommitmentConfig::confirmed(),
640+
);
620641
let result = ConfigValidator::validate_with_result(&rpc_client, true).await;
621642
assert!(result.is_err());
622643
let errors = result.unwrap_err();
@@ -661,7 +682,10 @@ mod tests {
661682

662683
let _ = update_config(config);
663684

664-
let rpc_client = RpcClient::new("http://localhost:8899".to_string());
685+
let rpc_client = RpcClient::new_with_commitment(
686+
"http://localhost:8899".to_string(),
687+
CommitmentConfig::confirmed(),
688+
);
665689
let result = ConfigValidator::validate_with_result(&rpc_client, true).await;
666690
assert!(result.is_ok());
667691
let warnings = result.unwrap();
@@ -693,7 +717,10 @@ mod tests {
693717

694718
let _ = update_config(config);
695719

696-
let rpc_client = RpcClient::new("http://localhost:8899".to_string());
720+
let rpc_client = RpcClient::new_with_commitment(
721+
"http://localhost:8899".to_string(),
722+
CommitmentConfig::confirmed(),
723+
);
697724
let result = ConfigValidator::validate_with_result(&rpc_client, true).await;
698725
assert!(result.is_err());
699726
let errors = result.unwrap_err();
@@ -980,7 +1007,10 @@ mod tests {
9801007

9811008
let _ = update_config(config);
9821009

983-
let rpc_client = RpcClient::new("http://localhost:8899".to_string());
1010+
let rpc_client = RpcClient::new_with_commitment(
1011+
"http://localhost:8899".to_string(),
1012+
CommitmentConfig::confirmed(),
1013+
);
9841014
let result = ConfigValidator::validate_with_result(&rpc_client, true).await;
9851015
assert!(result.is_ok());
9861016
}
@@ -1011,7 +1041,10 @@ mod tests {
10111041

10121042
let _ = update_config(config);
10131043

1014-
let rpc_client = RpcClient::new("http://localhost:8899".to_string());
1044+
let rpc_client = RpcClient::new_with_commitment(
1045+
"http://localhost:8899".to_string(),
1046+
CommitmentConfig::confirmed(),
1047+
);
10151048
let result = ConfigValidator::validate_with_result(&rpc_client, true).await;
10161049
assert!(result.is_err());
10171050
let errors = result.unwrap_err();
@@ -1046,7 +1079,10 @@ mod tests {
10461079

10471080
let _ = update_config(config);
10481081

1049-
let rpc_client = RpcClient::new("http://localhost:8899".to_string());
1082+
let rpc_client = RpcClient::new_with_commitment(
1083+
"http://localhost:8899".to_string(),
1084+
CommitmentConfig::confirmed(),
1085+
);
10501086
let result = ConfigValidator::validate_with_result(&rpc_client, true).await;
10511087
assert!(result.is_err());
10521088
let errors = result.unwrap_err();

‎tests/src/bin/test_runner.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use clap::Parser;
22
use solana_client::nonblocking::rpc_client::RpcClient;
3+
use solana_commitment_config::CommitmentConfig;
34
use std::{collections::HashMap, sync::Arc, time::Instant};
45
use tests::{
56
common::{constants::DEFAULT_RPC_URL, setup::TestAccountSetup, TestAccountInfo},
@@ -41,7 +42,10 @@ impl TestRunner {
4142
}
4243

4344
Ok(Self {
44-
rpc_client: Arc::new(RpcClient::new(rpc_url)),
45+
rpc_client: Arc::new(RpcClient::new_with_commitment(
46+
rpc_url,
47+
CommitmentConfig::confirmed(),
48+
)),
4549
reqwest_client: reqwest::Client::new(),
4650
solana_test_validator_pid: None,
4751
test_accounts: TestAccountInfo::default(),

‎tests/src/common/client.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use jsonrpsee::{
66
http_client::{HttpClient, HttpClientBuilder},
77
};
88
use solana_client::nonblocking::rpc_client::RpcClient;
9+
use solana_commitment_config::CommitmentConfig;
910
use std::sync::Arc;
1011

1112
use crate::common::{
@@ -33,7 +34,10 @@ impl TestClient {
3334
.build(&server_url)
3435
.map_err(|e| anyhow::anyhow!("Failed to create HTTP client: {}", e))?;
3536

36-
let rpc_client = Arc::new(RpcClient::new(rpc_url.clone()));
37+
let rpc_client = Arc::new(RpcClient::new_with_commitment(
38+
rpc_url.clone(),
39+
CommitmentConfig::confirmed(),
40+
));
3741

3842
Ok(Self { http_client, rpc_client, server_url, rpc_url })
3943
}

‎tests/src/common/setup.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ impl TestAccountSetup {
6161
dotenv::dotenv().ok();
6262
let rpc_url = std::env::var("RPC_URL").unwrap_or_else(|_| DEFAULT_RPC_URL.to_string());
6363
let rpc_client =
64-
Arc::new(RpcClient::new_with_commitment(rpc_url, CommitmentConfig::finalized()));
64+
Arc::new(RpcClient::new_with_commitment(rpc_url, CommitmentConfig::confirmed()));
6565
Self::new_with_client(rpc_client).await
6666
}
6767

6868
pub async fn new_with_rpc_url(rpc_url: &str) -> Self {
6969
let rpc_client = Arc::new(RpcClient::new_with_commitment(
7070
rpc_url.to_string(),
71-
CommitmentConfig::finalized(),
71+
CommitmentConfig::confirmed(),
7272
));
7373
Self::new_with_client(rpc_client).await
7474
}

‎tests/src/common/transaction.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ impl TransactionBuilder {
260260
let fee_payer = self.fee_payer.ok_or_else(|| anyhow::anyhow!("Fee payer is required"))?;
261261

262262
let blockhash =
263-
rpc_client.get_latest_blockhash_with_commitment(CommitmentConfig::finalized()).await?;
263+
rpc_client.get_latest_blockhash_with_commitment(CommitmentConfig::confirmed()).await?;
264264

265265
let message =
266266
match self.version {

‎tests/src/test_runner/validator.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ const TRANSFER_HOOK_PROGRAM_PATH: &str =
1111
"tests/src/common/transfer-hook-example/transfer_hook_example.so";
1212

1313
pub async fn check_test_validator(rpc_url: &str) -> bool {
14-
let client = RpcClient::new(rpc_url.to_string());
14+
let client = RpcClient::new_with_commitment(
15+
rpc_url.to_string(),
16+
solana_commitment_config::CommitmentConfig::confirmed(),
17+
);
1518
client.get_health().await.is_ok()
1619
}
1720

0 commit comments

Comments
 (0)