@@ -78,8 +78,6 @@ use tracing::{
7878 info_span, instrument, Instrument ,
7979} ;
8080
81- use self :: connection_pool:: VersionedMessage ;
82-
8381pub const RECONNECT_TIMEOUT : Duration = Duration :: from_secs ( 30 ) ;
8482
8583// kubernetes gives terminated pods 10s to shutdown gracefully. After they're gone, we can clean up old resources.
@@ -507,7 +505,7 @@ impl Server {
507505 forward_mutating_project_request :: < proto:: ApplyCompletionAdditionalEdits > ,
508506 ) )
509507 . add_request_handler ( user_handler (
510- forward_versioned_mutating_project_request :: < proto:: OpenNewBuffer > ,
508+ forward_mutating_project_request :: < proto:: OpenNewBuffer > ,
511509 ) )
512510 . add_request_handler ( user_handler (
513511 forward_mutating_project_request :: < proto:: ResolveCompletionDocumentation > ,
@@ -549,7 +547,7 @@ impl Server {
549547 forward_mutating_project_request :: < proto:: OnTypeFormatting > ,
550548 ) )
551549 . add_request_handler ( user_handler (
552- forward_versioned_mutating_project_request :: < proto:: SaveBuffer > ,
550+ forward_mutating_project_request :: < proto:: SaveBuffer > ,
553551 ) )
554552 . add_request_handler ( user_handler (
555553 forward_mutating_project_request :: < proto:: BlameBuffer > ,
@@ -3047,45 +3045,6 @@ where
30473045 Ok ( ( ) )
30483046}
30493047
3050- /// forward a project request to the host. These requests are disallowed
3051- /// for guests.
3052- async fn forward_versioned_mutating_project_request < T > (
3053- request : T ,
3054- response : Response < T > ,
3055- session : UserSession ,
3056- ) -> Result < ( ) >
3057- where
3058- T : EntityMessage + RequestMessage + VersionedMessage ,
3059- {
3060- let project_id = ProjectId :: from_proto ( request. remote_entity_id ( ) ) ;
3061-
3062- let host_connection_id = session
3063- . db ( )
3064- . await
3065- . host_for_mutating_project_request ( project_id, session. connection_id , session. user_id ( ) )
3066- . await ?;
3067- if let Some ( host_version) = session
3068- . connection_pool ( )
3069- . await
3070- . connection ( host_connection_id)
3071- . map ( |c| c. zed_version )
3072- {
3073- if let Some ( min_required_version) = request. required_host_version ( ) {
3074- if min_required_version > host_version {
3075- return Err ( anyhow ! ( ErrorCode :: RemoteUpgradeRequired
3076- . with_tag( "required" , & min_required_version. to_string( ) ) ) ) ?;
3077- }
3078- }
3079- }
3080-
3081- let payload = session
3082- . peer
3083- . forward_request ( session. connection_id , host_connection_id, request)
3084- . await ?;
3085- response. send ( payload) ?;
3086- Ok ( ( ) )
3087- }
3088-
30893048/// Notify other participants that a new buffer has been created
30903049async fn create_buffer_for_peer (
30913050 request : proto:: CreateBufferForPeer ,
0 commit comments