Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow to create HTTP Sender with custom Client #33580

Merged
merged 2 commits into from
Oct 10, 2023
Merged

Allow to create HTTP Sender with custom Client #33580

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1317ebc
Allow to create HTTP Sender with custom Client
fanatid Oct 7, 2023
90273e7
Update rpc-client/src/http_sender.rs
fanatid Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 23 additions & 13 deletions rpc-client/src/http_sender.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,31 +47,41 @@ impl HttpSender {
///
/// The URL is an HTTP URL, usually for port 8899.
pub fn new_with_timeout<U: ToString>(url: U, timeout: Duration) -> Self {
let mut default_headers = header::HeaderMap::new();
default_headers.append(
header::HeaderName::from_static("solana-client"),
header::HeaderValue::from_str(
format!("rust/{}", solana_version::Version::default()).as_str(),
)
.unwrap(),
);

let client = Arc::new(
Self::new_with_client(
url,
reqwest::Client::builder()
.default_headers(default_headers)
.default_headers(Self::default_headers())
.timeout(timeout)
.pool_idle_timeout(timeout)
.build()
.expect("build rpc client"),
);
)
}

/// Create an HTTP RPC sender.
///
/// Most flexiable way to create sender. Accept created `reqwest::Client`.
fanatid marked this conversation as resolved.
Show resolved Hide resolved
pub fn new_with_client<U: ToString>(url: U, client: reqwest::Client) -> Self {
Self {
client,
client: Arc::new(client),
url: url.to_string(),
request_id: AtomicU64::new(0),
stats: RwLock::new(RpcTransportStats::default()),
}
}

/// Create default headers used by HTTP Sender.
pub fn default_headers() -> header::HeaderMap {
let mut default_headers = header::HeaderMap::new();
default_headers.append(
header::HeaderName::from_static("solana-client"),
header::HeaderValue::from_str(
format!("rust/{}", solana_version::Version::default()).as_str(),
)
.unwrap(),
);
default_headers
}
}

struct StatsUpdater<'a> {
Expand Down