Skip to content

Commit f9dee8e

Browse files
macladsonmacladson
committed
Prepare sensitive_url for crates.io
1 parent 73e75e3 commit f9dee8e

File tree

16 files changed

+223
-91
lines changed

16 files changed

+223
-91
lines changed

‎Cargo.lock‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎beacon_node/builder_client/src/lib.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ impl BuilderHttpClient {
278278
&self,
279279
validator: &[SignedValidatorRegistrationData],
280280
) -> Result<(), Error> {
281-
let mut path = self.server.full.clone();
281+
let mut path = self.server.expose_full().clone();
282282

283283
path.path_segments_mut()
284284
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -297,7 +297,7 @@ impl BuilderHttpClient {
297297
&self,
298298
blinded_block: &SignedBlindedBeaconBlock<E>,
299299
) -> Result<FullPayloadContents<E>, Error> {
300-
let mut path = self.server.full.clone();
300+
let mut path = self.server.expose_full().clone();
301301

302302
let body = blinded_block.as_ssz_bytes();
303303

@@ -345,7 +345,7 @@ impl BuilderHttpClient {
345345
&self,
346346
blinded_block: &SignedBlindedBeaconBlock<E>,
347347
) -> Result<(), Error> {
348-
let mut path = self.server.full.clone();
348+
let mut path = self.server.expose_full().clone();
349349

350350
let body = blinded_block.as_ssz_bytes();
351351

@@ -395,7 +395,7 @@ impl BuilderHttpClient {
395395
&self,
396396
blinded_block: &SignedBlindedBeaconBlock<E>,
397397
) -> Result<ForkVersionedResponse<FullPayloadContents<E>>, Error> {
398-
let mut path = self.server.full.clone();
398+
let mut path = self.server.expose_full().clone();
399399

400400
path.path_segments_mut()
401401
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -438,7 +438,7 @@ impl BuilderHttpClient {
438438
&self,
439439
blinded_block: &SignedBlindedBeaconBlock<E>,
440440
) -> Result<(), Error> {
441-
let mut path = self.server.full.clone();
441+
let mut path = self.server.expose_full().clone();
442442

443443
path.path_segments_mut()
444444
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -488,7 +488,7 @@ impl BuilderHttpClient {
488488
parent_hash: ExecutionBlockHash,
489489
pubkey: &PublicKeyBytes,
490490
) -> Result<Option<ForkVersionedResponse<SignedBuilderBid<E>>>, Error> {
491-
let mut path = self.server.full.clone();
491+
let mut path = self.server.expose_full().clone();
492492

493493
path.path_segments_mut()
494494
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -529,7 +529,7 @@ impl BuilderHttpClient {
529529

530530
/// `GET /eth/v1/builder/status`
531531
pub async fn get_builder_status<E: EthSpec>(&self) -> Result<(), Error> {
532-
let mut path = self.server.full.clone();
532+
let mut path = self.server.expose_full().clone();
533533

534534
path.path_segments_mut()
535535
.map_err(|()| Error::InvalidUrl(self.server.clone()))?

‎beacon_node/execution_layer/src/engine_api/http.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ impl HttpJsonRpc {
652652

653653
let mut request = self
654654
.client
655-
.post(self.url.full.clone())
655+
.post(self.url.expose_full().clone())
656656
.timeout(timeout)
657657
.header(CONTENT_TYPE, "application/json")
658658
.json(&body);

‎common/eth2/src/lib.rs‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use reqwest::{
2929
};
3030
pub use reqwest::{StatusCode, Url};
3131
use reqwest_eventsource::{Event, EventSource};
32-
pub use sensitive_url::{SensitiveError, SensitiveUrl};
32+
pub use sensitive_url::SensitiveUrl;
3333
use serde::{Serialize, de::DeserializeOwned};
3434
use ssz::Encode;
3535
use std::fmt;
@@ -229,12 +229,6 @@ impl fmt::Display for BeaconNodeHttpClient {
229229
}
230230
}
231231

232-
impl AsRef<str> for BeaconNodeHttpClient {
233-
fn as_ref(&self) -> &str {
234-
self.server.as_ref()
235-
}
236-
}
237-
238232
impl BeaconNodeHttpClient {
239233
pub fn new(server: SensitiveUrl, timeouts: Timeouts) -> Self {
240234
Self {
@@ -255,10 +249,14 @@ impl BeaconNodeHttpClient {
255249
timeouts,
256250
}
257251
}
252+
// Returns a reference to the `SensitiveUrl` of the server.
253+
pub fn server(&self) -> &SensitiveUrl {
254+
&self.server
255+
}
258256

259257
/// Return the path with the standard `/eth/vX` prefix applied.
260258
fn eth_path(&self, version: EndpointVersion) -> Result<Url, Error> {
261-
let mut path = self.server.full.clone();
259+
let mut path = self.server.expose_full().clone();
262260

263261
path.path_segments_mut()
264262
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -2681,7 +2679,7 @@ impl BeaconNodeHttpClient {
26812679
ids: &[u64],
26822680
epoch: Epoch,
26832681
) -> Result<GenericResponse<Vec<LivenessResponseData>>, Error> {
2684-
let mut path = self.server.full.clone();
2682+
let mut path = self.server.expose_full().clone();
26852683

26862684
path.path_segments_mut()
26872685
.map_err(|()| Error::InvalidUrl(self.server.clone()))?

‎common/eth2/src/lighthouse.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ pub struct DepositLog {
171171
impl BeaconNodeHttpClient {
172172
/// `GET lighthouse/health`
173173
pub async fn get_lighthouse_health(&self) -> Result<GenericResponse<Health>, Error> {
174-
let mut path = self.server.full.clone();
174+
let mut path = self.server.expose_full().clone();
175175

176176
path.path_segments_mut()
177177
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -183,7 +183,7 @@ impl BeaconNodeHttpClient {
183183

184184
/// `GET lighthouse/syncing`
185185
pub async fn get_lighthouse_syncing(&self) -> Result<GenericResponse<SyncState>, Error> {
186-
let mut path = self.server.full.clone();
186+
let mut path = self.server.expose_full().clone();
187187

188188
path.path_segments_mut()
189189
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -203,7 +203,7 @@ impl BeaconNodeHttpClient {
203203

204204
/// `GET lighthouse/proto_array`
205205
pub async fn get_lighthouse_proto_array(&self) -> Result<GenericResponse<ProtoArray>, Error> {
206-
let mut path = self.server.full.clone();
206+
let mut path = self.server.expose_full().clone();
207207

208208
path.path_segments_mut()
209209
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -218,7 +218,7 @@ impl BeaconNodeHttpClient {
218218
&self,
219219
epoch: Epoch,
220220
) -> Result<GenericResponse<GlobalValidatorInclusionData>, Error> {
221-
let mut path = self.server.full.clone();
221+
let mut path = self.server.expose_full().clone();
222222

223223
path.path_segments_mut()
224224
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -236,7 +236,7 @@ impl BeaconNodeHttpClient {
236236
epoch: Epoch,
237237
validator_id: ValidatorId,
238238
) -> Result<GenericResponse<Option<ValidatorInclusionData>>, Error> {
239-
let mut path = self.server.full.clone();
239+
let mut path = self.server.expose_full().clone();
240240

241241
path.path_segments_mut()
242242
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -250,7 +250,7 @@ impl BeaconNodeHttpClient {
250250

251251
/// `POST lighthouse/database/reconstruct`
252252
pub async fn post_lighthouse_database_reconstruct(&self) -> Result<String, Error> {
253-
let mut path = self.server.full.clone();
253+
let mut path = self.server.expose_full().clone();
254254

255255
path.path_segments_mut()
256256
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -263,7 +263,7 @@ impl BeaconNodeHttpClient {
263263

264264
/// `POST lighthouse/add_peer`
265265
pub async fn post_lighthouse_add_peer(&self, req: AdminPeer) -> Result<(), Error> {
266-
let mut path = self.server.full.clone();
266+
let mut path = self.server.expose_full().clone();
267267

268268
path.path_segments_mut()
269269
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -275,7 +275,7 @@ impl BeaconNodeHttpClient {
275275

276276
/// `POST lighthouse/remove_peer`
277277
pub async fn post_lighthouse_remove_peer(&self, req: AdminPeer) -> Result<(), Error> {
278-
let mut path = self.server.full.clone();
278+
let mut path = self.server.expose_full().clone();
279279

280280
path.path_segments_mut()
281281
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -295,7 +295,7 @@ impl BeaconNodeHttpClient {
295295
start_slot: Slot,
296296
end_slot: Slot,
297297
) -> Result<Vec<BlockReward>, Error> {
298-
let mut path = self.server.full.clone();
298+
let mut path = self.server.expose_full().clone();
299299

300300
path.path_segments_mut()
301301
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -316,7 +316,7 @@ impl BeaconNodeHttpClient {
316316
start_epoch: Epoch,
317317
end_epoch: Epoch,
318318
) -> Result<Vec<BlockPackingEfficiency>, Error> {
319-
let mut path = self.server.full.clone();
319+
let mut path = self.server.expose_full().clone();
320320

321321
path.path_segments_mut()
322322
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -338,7 +338,7 @@ impl BeaconNodeHttpClient {
338338
end_epoch: Epoch,
339339
target: String,
340340
) -> Result<Vec<AttestationPerformance>, Error> {
341-
let mut path = self.server.full.clone();
341+
let mut path = self.server.expose_full().clone();
342342

343343
path.path_segments_mut()
344344
.map_err(|()| Error::InvalidUrl(self.server.clone()))?

‎common/eth2/src/lighthouse_vc/http_client.rs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ impl ValidatorClientHttpClient {
283283

284284
/// `GET lighthouse/version`
285285
pub async fn get_lighthouse_version(&self) -> Result<GenericResponse<VersionData>, Error> {
286-
let mut path = self.server.full.clone();
286+
let mut path = self.server.expose_full().clone();
287287

288288
path.path_segments_mut()
289289
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -295,7 +295,7 @@ impl ValidatorClientHttpClient {
295295

296296
/// `GET lighthouse/health`
297297
pub async fn get_lighthouse_health(&self) -> Result<GenericResponse<Health>, Error> {
298-
let mut path = self.server.full.clone();
298+
let mut path = self.server.expose_full().clone();
299299

300300
path.path_segments_mut()
301301
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -309,7 +309,7 @@ impl ValidatorClientHttpClient {
309309
pub async fn get_lighthouse_spec<T: Serialize + DeserializeOwned>(
310310
&self,
311311
) -> Result<GenericResponse<T>, Error> {
312-
let mut path = self.server.full.clone();
312+
let mut path = self.server.expose_full().clone();
313313

314314
path.path_segments_mut()
315315
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -323,7 +323,7 @@ impl ValidatorClientHttpClient {
323323
pub async fn get_lighthouse_validators(
324324
&self,
325325
) -> Result<GenericResponse<Vec<ValidatorData>>, Error> {
326-
let mut path = self.server.full.clone();
326+
let mut path = self.server.expose_full().clone();
327327

328328
path.path_segments_mut()
329329
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -338,7 +338,7 @@ impl ValidatorClientHttpClient {
338338
&self,
339339
validator_pubkey: &PublicKeyBytes,
340340
) -> Result<Option<GenericResponse<ValidatorData>>, Error> {
341-
let mut path = self.server.full.clone();
341+
let mut path = self.server.expose_full().clone();
342342

343343
path.path_segments_mut()
344344
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -354,7 +354,7 @@ impl ValidatorClientHttpClient {
354354
&self,
355355
validators: Vec<ValidatorRequest>,
356356
) -> Result<GenericResponse<PostValidatorsResponseData>, Error> {
357-
let mut path = self.server.full.clone();
357+
let mut path = self.server.expose_full().clone();
358358

359359
path.path_segments_mut()
360360
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -369,7 +369,7 @@ impl ValidatorClientHttpClient {
369369
&self,
370370
request: &CreateValidatorsMnemonicRequest,
371371
) -> Result<GenericResponse<Vec<CreatedValidator>>, Error> {
372-
let mut path = self.server.full.clone();
372+
let mut path = self.server.expose_full().clone();
373373

374374
path.path_segments_mut()
375375
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -385,7 +385,7 @@ impl ValidatorClientHttpClient {
385385
&self,
386386
request: &KeystoreValidatorsPostRequest,
387387
) -> Result<GenericResponse<ValidatorData>, Error> {
388-
let mut path = self.server.full.clone();
388+
let mut path = self.server.expose_full().clone();
389389

390390
path.path_segments_mut()
391391
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -401,7 +401,7 @@ impl ValidatorClientHttpClient {
401401
&self,
402402
request: &[Web3SignerValidatorRequest],
403403
) -> Result<(), Error> {
404-
let mut path = self.server.full.clone();
404+
let mut path = self.server.expose_full().clone();
405405

406406
path.path_segments_mut()
407407
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -424,7 +424,7 @@ impl ValidatorClientHttpClient {
424424
prefer_builder_proposals: Option<bool>,
425425
graffiti: Option<GraffitiString>,
426426
) -> Result<(), Error> {
427-
let mut path = self.server.full.clone();
427+
let mut path = self.server.expose_full().clone();
428428

429429
path.path_segments_mut()
430430
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -451,7 +451,7 @@ impl ValidatorClientHttpClient {
451451
&self,
452452
req: &DeleteKeystoresRequest,
453453
) -> Result<ExportKeystoresResponse, Error> {
454-
let mut path = self.server.full.clone();
454+
let mut path = self.server.expose_full().clone();
455455

456456
path.path_segments_mut()
457457
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -462,7 +462,7 @@ impl ValidatorClientHttpClient {
462462
}
463463

464464
fn make_keystores_url(&self) -> Result<Url, Error> {
465-
let mut url = self.server.full.clone();
465+
let mut url = self.server.expose_full().clone();
466466
url.path_segments_mut()
467467
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
468468
.push("eth")
@@ -472,7 +472,7 @@ impl ValidatorClientHttpClient {
472472
}
473473

474474
fn make_remotekeys_url(&self) -> Result<Url, Error> {
475-
let mut url = self.server.full.clone();
475+
let mut url = self.server.expose_full().clone();
476476
url.path_segments_mut()
477477
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
478478
.push("eth")
@@ -482,7 +482,7 @@ impl ValidatorClientHttpClient {
482482
}
483483

484484
fn make_fee_recipient_url(&self, pubkey: &PublicKeyBytes) -> Result<Url, Error> {
485-
let mut url = self.server.full.clone();
485+
let mut url = self.server.expose_full().clone();
486486
url.path_segments_mut()
487487
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
488488
.push("eth")
@@ -494,7 +494,7 @@ impl ValidatorClientHttpClient {
494494
}
495495

496496
fn make_graffiti_url(&self, pubkey: &PublicKeyBytes) -> Result<Url, Error> {
497-
let mut url = self.server.full.clone();
497+
let mut url = self.server.expose_full().clone();
498498
url.path_segments_mut()
499499
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
500500
.push("eth")
@@ -506,7 +506,7 @@ impl ValidatorClientHttpClient {
506506
}
507507

508508
fn make_gas_limit_url(&self, pubkey: &PublicKeyBytes) -> Result<Url, Error> {
509-
let mut url = self.server.full.clone();
509+
let mut url = self.server.expose_full().clone();
510510
url.path_segments_mut()
511511
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
512512
.push("eth")
@@ -519,7 +519,7 @@ impl ValidatorClientHttpClient {
519519

520520
/// `GET lighthouse/auth`
521521
pub async fn get_auth(&self) -> Result<AuthResponse, Error> {
522-
let mut url = self.server.full.clone();
522+
let mut url = self.server.expose_full().clone();
523523
url.path_segments_mut()
524524
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
525525
.push("lighthouse")
@@ -635,7 +635,7 @@ impl ValidatorClientHttpClient {
635635
pubkey: &PublicKeyBytes,
636636
epoch: Option<Epoch>,
637637
) -> Result<GenericResponse<SignedVoluntaryExit>, Error> {
638-
let mut path = self.server.full.clone();
638+
let mut path = self.server.expose_full().clone();
639639

640640
path.path_segments_mut()
641641
.map_err(|()| Error::InvalidUrl(self.server.clone()))?

‎common/monitoring_api/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ impl MonitoringHttpClient {
195195
endpoint = %self.monitoring_endpoint,
196196
"Sending metrics to remote endpoint"
197197
);
198-
self.post(self.monitoring_endpoint.full.clone(), &metrics)
198+
self.post(self.monitoring_endpoint.expose_full().clone(), &metrics)
199199
.await
200200
}
201201
}

0 commit comments

Comments
 (0)