Skip to content

Commit 2e9aae7

Browse files
mergify[bot]mergify[bot]
authored
Merge of #8223 
2 parents bc86dc0 + 2b977ff commit 2e9aae7

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.

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ rpds = "0.11"
225225
rusqlite = { version = "0.28", features = ["bundled"] }
226226
rust_eth_kzg = "0.9"
227227
safe_arith = "0.1"
228-
sensitive_url = { path = "common/sensitive_url" }
228+
sensitive_url = { path = "common/sensitive_url", features = ["serde"] }
229229
serde = { version = "1", features = ["derive"] }
230230
serde_json = "1"
231231
serde_repr = "0.1"

‎beacon_node/builder_client/src/lib.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ impl BuilderHttpClient {
270270
&self,
271271
validator: &[SignedValidatorRegistrationData],
272272
) -> Result<(), Error> {
273-
let mut path = self.server.full.clone();
273+
let mut path = self.server.expose_full().clone();
274274

275275
path.path_segments_mut()
276276
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -289,7 +289,7 @@ impl BuilderHttpClient {
289289
&self,
290290
blinded_block: &SignedBlindedBeaconBlock<E>,
291291
) -> Result<FullPayloadContents<E>, Error> {
292-
let mut path = self.server.full.clone();
292+
let mut path = self.server.expose_full().clone();
293293

294294
let body = blinded_block.as_ssz_bytes();
295295

@@ -337,7 +337,7 @@ impl BuilderHttpClient {
337337
&self,
338338
blinded_block: &SignedBlindedBeaconBlock<E>,
339339
) -> Result<(), Error> {
340-
let mut path = self.server.full.clone();
340+
let mut path = self.server.expose_full().clone();
341341

342342
let body = blinded_block.as_ssz_bytes();
343343

@@ -387,7 +387,7 @@ impl BuilderHttpClient {
387387
&self,
388388
blinded_block: &SignedBlindedBeaconBlock<E>,
389389
) -> Result<ForkVersionedResponse<FullPayloadContents<E>>, Error> {
390-
let mut path = self.server.full.clone();
390+
let mut path = self.server.expose_full().clone();
391391

392392
path.path_segments_mut()
393393
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -430,7 +430,7 @@ impl BuilderHttpClient {
430430
&self,
431431
blinded_block: &SignedBlindedBeaconBlock<E>,
432432
) -> Result<(), Error> {
433-
let mut path = self.server.full.clone();
433+
let mut path = self.server.expose_full().clone();
434434

435435
path.path_segments_mut()
436436
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -480,7 +480,7 @@ impl BuilderHttpClient {
480480
parent_hash: ExecutionBlockHash,
481481
pubkey: &PublicKeyBytes,
482482
) -> Result<Option<ForkVersionedResponse<SignedBuilderBid<E>>>, Error> {
483-
let mut path = self.server.full.clone();
483+
let mut path = self.server.expose_full().clone();
484484

485485
path.path_segments_mut()
486486
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -521,7 +521,7 @@ impl BuilderHttpClient {
521521

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

526526
path.path_segments_mut()
527527
.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
@@ -30,7 +30,7 @@ use reqwest::{
3030
};
3131
pub use reqwest::{StatusCode, Url};
3232
use reqwest_eventsource::{Event, EventSource};
33-
pub use sensitive_url::{SensitiveError, SensitiveUrl};
33+
pub use sensitive_url::SensitiveUrl;
3434
use serde::{Serialize, de::DeserializeOwned};
3535
use ssz::Encode;
3636
use std::fmt;
@@ -152,12 +152,6 @@ impl fmt::Display for BeaconNodeHttpClient {
152152
}
153153
}
154154

155-
impl AsRef<str> for BeaconNodeHttpClient {
156-
fn as_ref(&self) -> &str {
157-
self.server.as_ref()
158-
}
159-
}
160-
161155
impl BeaconNodeHttpClient {
162156
pub fn new(server: SensitiveUrl, timeouts: Timeouts) -> Self {
163157
Self {
@@ -178,10 +172,14 @@ impl BeaconNodeHttpClient {
178172
timeouts,
179173
}
180174
}
175+
// Returns a reference to the `SensitiveUrl` of the server.
176+
pub fn server(&self) -> &SensitiveUrl {
177+
&self.server
178+
}
181179

182180
/// Return the path with the standard `/eth/vX` prefix applied.
183181
fn eth_path(&self, version: EndpointVersion) -> Result<Url, Error> {
184-
let mut path = self.server.full.clone();
182+
let mut path = self.server.expose_full().clone();
185183

186184
path.path_segments_mut()
187185
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -2613,7 +2611,7 @@ impl BeaconNodeHttpClient {
26132611
ids: &[u64],
26142612
epoch: Epoch,
26152613
) -> Result<GenericResponse<Vec<LivenessResponseData>>, Error> {
2616-
let mut path = self.server.full.clone();
2614+
let mut path = self.server.expose_full().clone();
26172615

26182616
path.path_segments_mut()
26192617
.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
@@ -173,7 +173,7 @@ pub struct DepositLog {
173173
impl BeaconNodeHttpClient {
174174
/// `GET lighthouse/health`
175175
pub async fn get_lighthouse_health(&self) -> Result<GenericResponse<Health>, Error> {
176-
let mut path = self.server.full.clone();
176+
let mut path = self.server.expose_full().clone();
177177

178178
path.path_segments_mut()
179179
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -185,7 +185,7 @@ impl BeaconNodeHttpClient {
185185

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

190190
path.path_segments_mut()
191191
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -218,7 +218,7 @@ impl BeaconNodeHttpClient {
218218

219219
/// `GET lighthouse/proto_array`
220220
pub async fn get_lighthouse_proto_array(&self) -> Result<GenericResponse<ProtoArray>, 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()))?
@@ -233,7 +233,7 @@ impl BeaconNodeHttpClient {
233233
&self,
234234
epoch: Epoch,
235235
) -> Result<GenericResponse<GlobalValidatorInclusionData>, Error> {
236-
let mut path = self.server.full.clone();
236+
let mut path = self.server.expose_full().clone();
237237

238238
path.path_segments_mut()
239239
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -251,7 +251,7 @@ impl BeaconNodeHttpClient {
251251
epoch: Epoch,
252252
validator_id: ValidatorId,
253253
) -> Result<GenericResponse<Option<ValidatorInclusionData>>, Error> {
254-
let mut path = self.server.full.clone();
254+
let mut path = self.server.expose_full().clone();
255255

256256
path.path_segments_mut()
257257
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -265,7 +265,7 @@ impl BeaconNodeHttpClient {
265265

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

270270
path.path_segments_mut()
271271
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -278,7 +278,7 @@ impl BeaconNodeHttpClient {
278278

279279
/// `POST lighthouse/add_peer`
280280
pub async fn post_lighthouse_add_peer(&self, req: AdminPeer) -> 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()))?
@@ -290,7 +290,7 @@ impl BeaconNodeHttpClient {
290290

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

295295
path.path_segments_mut()
296296
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -310,7 +310,7 @@ impl BeaconNodeHttpClient {
310310
start_slot: Slot,
311311
end_slot: Slot,
312312
) -> Result<Vec<BlockReward>, Error> {
313-
let mut path = self.server.full.clone();
313+
let mut path = self.server.expose_full().clone();
314314

315315
path.path_segments_mut()
316316
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -331,7 +331,7 @@ impl BeaconNodeHttpClient {
331331
start_epoch: Epoch,
332332
end_epoch: Epoch,
333333
) -> Result<Vec<BlockPackingEfficiency>, Error> {
334-
let mut path = self.server.full.clone();
334+
let mut path = self.server.expose_full().clone();
335335

336336
path.path_segments_mut()
337337
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
@@ -353,7 +353,7 @@ impl BeaconNodeHttpClient {
353353
end_epoch: Epoch,
354354
target: String,
355355
) -> Result<Vec<AttestationPerformance>, Error> {
356-
let mut path = self.server.full.clone();
356+
let mut path = self.server.expose_full().clone();
357357

358358
path.path_segments_mut()
359359
.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()))?

0 commit comments

Comments
 (0)