diff --git a/src/main.rs b/src/main.rs index ed7bc4c..de1f68c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,8 +16,6 @@ use clap::Parser; use reth::cli::Cli; use reth_block_validator::ValidationCliExt; - fn main() { Cli::::parse().run().unwrap(); } - diff --git a/tests/it/http.rs b/tests/it/http.rs index 6f9b370..d7dba9c 100644 --- a/tests/it/http.rs +++ b/tests/it/http.rs @@ -1,36 +1,38 @@ -use reth::providers::test_utils::NoopProvider; -use reth_block_validator::ValidationApi; use jsonrpsee::{core::error::Error, http_client::HttpClientBuilder, server::ServerBuilder}; +use reth::providers::test_utils::NoopProvider; use reth_block_validator::rpc::{ValidationApiClient, ValidationApiServer, ValidationRequestBody}; - - - - +use reth_block_validator::ValidationApi; const VALIDATION_REQUEST_BODY: &str = include_str!("../../tests/data/single_payload.json"); #[tokio::test(flavor = "multi_thread")] async fn test_call_admin_functions_ws() { let server_addr = start_server().await; - let uri = format!("http://{}", server_addr); - let client = HttpClientBuilder::default().build(&uri).unwrap(); - let validation_request_body: ValidationRequestBody = serde_json::from_str(VALIDATION_REQUEST_BODY).unwrap(); - let result = ValidationApiClient::validate_builder_submission_v2(&client, validation_request_body.clone()).await; - let expected_message = - format!("Block parent [hash:{:?}] is not known.", validation_request_body.execution_payload.parent_hash); + let uri = format!("http://{}", server_addr); + let client = HttpClientBuilder::default().build(&uri).unwrap(); + let validation_request_body: ValidationRequestBody = + serde_json::from_str(VALIDATION_REQUEST_BODY).unwrap(); + let result = ValidationApiClient::validate_builder_submission_v2( + &client, + validation_request_body.clone(), + ) + .await; + let expected_message = format!( + "Block parent [hash:{:?}] is not known.", + validation_request_body.execution_payload.parent_hash + ); let error_message = get_call_error_message(result.unwrap_err()).unwrap(); assert_eq!(error_message, expected_message); - } async fn start_server() -> std::net::SocketAddr { let server = ServerBuilder::default().build("127.0.0.1:0").await.unwrap(); - let addr = server.local_addr().unwrap(); + let addr = server.local_addr().unwrap(); let provider = NoopProvider::default(); let api = ValidationApi::new(provider); - let server_handle = server.start(api.into_rpc()); + let server_handle = server.start(api.into_rpc()); - tokio::spawn(server_handle.stopped()); + tokio::spawn(server_handle.stopped()); addr } diff --git a/tests/it/main.rs b/tests/it/main.rs index 2c4d312..90bf343 100644 --- a/tests/it/main.rs +++ b/tests/it/main.rs @@ -1,4 +1,3 @@ mod http; fn main() {} -