File tree Expand file tree Collapse file tree 5 files changed +8
-23
lines changed Expand file tree Collapse file tree 5 files changed +8
-23
lines changed Original file line number Diff line number Diff line change @@ -369,7 +369,7 @@ async fn fetch_lido_registry_keys(
369369}
370370
371371async fn fetch_ssv_pubkeys (
372- mut api_url : Url ,
372+ api_url : Url ,
373373 chain : Chain ,
374374 node_operator_id : U256 ,
375375 http_timeout : Duration ,
@@ -386,15 +386,6 @@ async fn fetch_ssv_pubkeys(
386386 let mut pubkeys: Vec < BlsPublicKey > = vec ! [ ] ;
387387 let mut page = 1 ;
388388
389- // Validate the URL - this appends a trailing slash if missing as efficiently as
390- // possible
391- if !api_url. path ( ) . ends_with ( '/' ) {
392- match api_url. path_segments_mut ( ) {
393- Ok ( mut segments) => segments. push ( "" ) , // Analogous to a trailing slash
394- Err ( _) => bail ! ( "SSV API URL is not a valid base URL" ) ,
395- } ;
396- }
397-
398389 loop {
399390 let route = format ! (
400391 "{chain_name}/validators/in_operator/{node_operator_id}?perPage={MAX_PER_PAGE}&page={page}" ,
Original file line number Diff line number Diff line change @@ -404,5 +404,5 @@ pub async fn load_pbs_custom_config<T: DeserializeOwned>() -> Result<(PbsModuleC
404404
405405/// Default URL for the SSV network API
406406fn default_ssv_api_url ( ) -> Url {
407- Url :: parse ( "https://api.ssv.network/api/v4/ " ) . expect ( "default URL is valid" )
407+ Url :: parse ( "https://api.ssv.network/api/v4" ) . expect ( "default URL is valid" )
408408}
Original file line number Diff line number Diff line change @@ -37,10 +37,7 @@ pub async fn create_mock_ssv_server(
3737 force_timeout : Arc :: new ( RwLock :: new ( false ) ) ,
3838 } ) ;
3939 let router = axum:: Router :: new ( )
40- . route (
41- "/api/v4/{chain_name}/validators/in_operator/{node_operator_id}" ,
42- get ( handle_validators) ,
43- )
40+ . route ( "/{chain_name}/validators/in_operator/{node_operator_id}" , get ( handle_validators) )
4441 . route ( "/big_data" , get ( handle_big_data) )
4542 . with_state ( state)
4643 . into_make_service ( ) ;
Original file line number Diff line number Diff line change @@ -29,9 +29,8 @@ async fn test_ssv_network_fetch() -> Result<()> {
2929 // Start the mock server
3030 let port = 30100 ;
3131 let _server_handle = create_mock_ssv_server ( port, None ) . await ?;
32- let url =
33- Url :: parse ( & format ! ( "http://localhost:{port}/api/v4/test_chain/validators/in_operator/1" ) )
34- . unwrap ( ) ;
32+ let url = Url :: parse ( & format ! ( "http://localhost:{port}/test_chain/validators/in_operator/1" ) )
33+ . unwrap ( ) ;
3534 let response =
3635 fetch_ssv_pubkeys_from_url ( url, Duration :: from_secs ( HTTP_TIMEOUT_SECONDS_DEFAULT ) ) . await ?;
3736
@@ -101,9 +100,8 @@ async fn test_ssv_network_fetch_timeout() -> Result<()> {
101100 force_timeout : Arc :: new ( RwLock :: new ( true ) ) ,
102101 } ;
103102 let server_handle = create_mock_ssv_server ( port, Some ( state) ) . await ?;
104- let url =
105- Url :: parse ( & format ! ( "http://localhost:{port}/api/v4/test_chain/validators/in_operator/1" ) )
106- . unwrap ( ) ;
103+ let url = Url :: parse ( & format ! ( "http://localhost:{port}/test_chain/validators/in_operator/1" ) )
104+ . unwrap ( ) ;
107105 let response = fetch_ssv_pubkeys_from_url ( url, Duration :: from_secs ( TEST_HTTP_TIMEOUT ) ) . await ;
108106
109107 // The response should fail due to timeout
Original file line number Diff line number Diff line change @@ -42,8 +42,7 @@ async fn test_auto_refresh() -> Result<()> {
4242
4343 // Start the mock SSV API server
4444 let ssv_api_port = pbs_port + 1 ;
45- // Intentionally missing a trailing slash to ensure this is handled properly
46- let ssv_api_url = Url :: parse ( & format ! ( "http://localhost:{ssv_api_port}/api/v4" ) ) ?;
45+ let ssv_api_url = Url :: parse ( & format ! ( "http://localhost:{ssv_api_port}" ) ) ?;
4746 let mock_ssv_state = SsvMockState {
4847 validators : Arc :: new ( RwLock :: new ( vec ! [ SSVValidator {
4948 pubkey: existing_mux_pubkey. clone( ) ,
You can’t perform that action at this time.
0 commit comments