diff --git a/client/src/http_sender.rs b/client/src/http_sender.rs index f38ce866da..f1e3601b6c 100644 --- a/client/src/http_sender.rs +++ b/client/src/http_sender.rs @@ -38,14 +38,14 @@ impl HttpSender { /// /// The URL is an HTTP URL, usually for port 8899, as in /// "http://localhost:8899". The sender has a default timeout of 30 seconds. - pub fn new(url: String) -> Self { + pub fn new(url: U) -> Self { Self::new_with_timeout(url, Duration::from_secs(30)) } /// Create an HTTP RPC sender. /// /// The URL is an HTTP URL, usually for port 8899. - pub fn new_with_timeout(url: String, timeout: Duration) -> Self { + pub fn new_with_timeout(url: U, timeout: Duration) -> Self { let client = Arc::new( reqwest::Client::builder() .timeout(timeout) @@ -55,7 +55,7 @@ impl HttpSender { Self { client, - url, + url: url.to_string(), request_id: AtomicU64::new(0), stats: RwLock::new(RpcTransportStats::default()), } diff --git a/client/src/mock_sender.rs b/client/src/mock_sender.rs index aa301bc426..ed068f8c11 100644 --- a/client/src/mock_sender.rs +++ b/client/src/mock_sender.rs @@ -74,13 +74,13 @@ pub struct MockSender { /// from [`RpcRequest`] to a JSON [`Value`] response, Any entries in this map /// override the default behavior for the given request. impl MockSender { - pub fn new(url: String) -> Self { + pub fn new(url: U) -> Self { Self::new_with_mocks(url, Mocks::default()) } - pub fn new_with_mocks(url: String, mocks: Mocks) -> Self { + pub fn new_with_mocks(url: U, mocks: Mocks) -> Self { Self { - url, + url: url.to_string(), mocks: RwLock::new(mocks), } } diff --git a/client/src/rpc_client.rs b/client/src/rpc_client.rs index 475ba1a503..ee1a311093 100644 --- a/client/src/rpc_client.rs +++ b/client/src/rpc_client.rs @@ -197,7 +197,7 @@ impl RpcClient { /// let url = "http://localhost:8899".to_string(); /// let client = RpcClient::new(url); /// ``` - pub fn new(url: String) -> Self { + pub fn new(url: U) -> Self { Self::new_with_commitment(url, CommitmentConfig::default()) } @@ -220,7 +220,7 @@ impl RpcClient { /// let commitment_config = CommitmentConfig::processed(); /// let client = RpcClient::new_with_commitment(url, commitment_config); /// ``` - pub fn new_with_commitment(url: String, commitment_config: CommitmentConfig) -> Self { + pub fn new_with_commitment(url: U, commitment_config: CommitmentConfig) -> Self { Self::new_sender( HttpSender::new(url), RpcClientConfig::with_commitment(commitment_config), @@ -246,7 +246,7 @@ impl RpcClient { /// let timeout = Duration::from_secs(1); /// let client = RpcClient::new_with_timeout(url, timeout); /// ``` - pub fn new_with_timeout(url: String, timeout: Duration) -> Self { + pub fn new_with_timeout(url: U, timeout: Duration) -> Self { Self::new_sender( HttpSender::new_with_timeout(url, timeout), RpcClientConfig::with_commitment(CommitmentConfig::default()), @@ -275,8 +275,8 @@ impl RpcClient { /// commitment_config, /// ); /// ``` - pub fn new_with_timeout_and_commitment( - url: String, + pub fn new_with_timeout_and_commitment( + url: U, timeout: Duration, commitment_config: CommitmentConfig, ) -> Self { @@ -318,8 +318,8 @@ impl RpcClient { /// confirm_transaction_initial_timeout, /// ); /// ``` - pub fn new_with_timeouts_and_commitment( - url: String, + pub fn new_with_timeouts_and_commitment( + url: U, timeout: Duration, commitment_config: CommitmentConfig, confirm_transaction_initial_timeout: Duration, @@ -353,7 +353,7 @@ impl RpcClient { /// let url = "fails".to_string(); /// let successful_client = RpcClient::new_mock(url); /// ``` - pub fn new_mock(url: String) -> Self { + pub fn new_mock(url: U) -> Self { Self::new_sender( MockSender::new(url), RpcClientConfig::with_commitment(CommitmentConfig::default()), @@ -387,7 +387,7 @@ impl RpcClient { /// let url = "succeeds".to_string(); /// let client = RpcClient::new_mock_with_mocks(url, mocks); /// ``` - pub fn new_mock_with_mocks(url: String, mocks: Mocks) -> Self { + pub fn new_mock_with_mocks(url: U, mocks: Mocks) -> Self { Self::new_sender( MockSender::new_with_mocks(url, mocks), RpcClientConfig::with_commitment(CommitmentConfig::default()),