Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add a Test message that we can use to assert on the behavior of Peer

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-02-16 18:32:03 +01:00
parent 0173025f4b
commit 20858699bc
3 changed files with 63 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

105
crates/rpc/proto/zed.proto
View file

@ -9,62 +9,63 @@ message Envelope {
Ack ack = 4; Ack ack = 4;
Error error = 5; Error error = 5;
Ping ping = 6; Ping ping = 6;
Test test = 7;
RegisterProject register_project = 7; RegisterProject register_project = 8;
RegisterProjectResponse register_project_response = 8; RegisterProjectResponse register_project_response = 9;
UnregisterProject unregister_project = 9; UnregisterProject unregister_project = 10;
ShareProject share_project = 10; ShareProject share_project = 11;
UnshareProject unshare_project = 11; UnshareProject unshare_project = 12;
JoinProject join_project = 12; JoinProject join_project = 13;
JoinProjectResponse join_project_response = 13; JoinProjectResponse join_project_response = 14;
LeaveProject leave_project = 14; LeaveProject leave_project = 15;
AddProjectCollaborator add_project_collaborator = 15; AddProjectCollaborator add_project_collaborator = 16;
RemoveProjectCollaborator remove_project_collaborator = 16; RemoveProjectCollaborator remove_project_collaborator = 17;
GetDefinition get_definition = 17; GetDefinition get_definition = 18;
GetDefinitionResponse get_definition_response = 18; GetDefinitionResponse get_definition_response = 19;
RegisterWorktree register_worktree = 19; RegisterWorktree register_worktree = 20;
UnregisterWorktree unregister_worktree = 20; UnregisterWorktree unregister_worktree = 21;
ShareWorktree share_worktree = 21; ShareWorktree share_worktree = 22;
UpdateWorktree update_worktree = 22; UpdateWorktree update_worktree = 23;
UpdateDiagnosticSummary update_diagnostic_summary = 23; UpdateDiagnosticSummary update_diagnostic_summary = 24;
DiskBasedDiagnosticsUpdating disk_based_diagnostics_updating = 24; DiskBasedDiagnosticsUpdating disk_based_diagnostics_updating = 25;
DiskBasedDiagnosticsUpdated disk_based_diagnostics_updated = 25; DiskBasedDiagnosticsUpdated disk_based_diagnostics_updated = 26;
OpenBuffer open_buffer = 26; OpenBuffer open_buffer = 27;
OpenBufferResponse open_buffer_response = 27; OpenBufferResponse open_buffer_response = 28;
CloseBuffer close_buffer = 28; CloseBuffer close_buffer = 29;
UpdateBuffer update_buffer = 29; UpdateBuffer update_buffer = 30;
UpdateBufferFile update_buffer_file = 30; UpdateBufferFile update_buffer_file = 31;
SaveBuffer save_buffer = 31; SaveBuffer save_buffer = 32;
BufferSaved buffer_saved = 32; BufferSaved buffer_saved = 33;
BufferReloaded buffer_reloaded = 33; BufferReloaded buffer_reloaded = 34;
FormatBuffers format_buffers = 34; FormatBuffers format_buffers = 35;
FormatBuffersResponse format_buffers_response = 35; FormatBuffersResponse format_buffers_response = 36;
GetCompletions get_completions = 36; GetCompletions get_completions = 37;
GetCompletionsResponse get_completions_response = 37; GetCompletionsResponse get_completions_response = 38;
ApplyCompletionAdditionalEdits apply_completion_additional_edits = 38; ApplyCompletionAdditionalEdits apply_completion_additional_edits = 39;
ApplyCompletionAdditionalEditsResponse apply_completion_additional_edits_response = 39; ApplyCompletionAdditionalEditsResponse apply_completion_additional_edits_response = 40;
GetCodeActions get_code_actions = 40; GetCodeActions get_code_actions = 41;
GetCodeActionsResponse get_code_actions_response = 41; GetCodeActionsResponse get_code_actions_response = 42;
ApplyCodeAction apply_code_action = 42; ApplyCodeAction apply_code_action = 43;
ApplyCodeActionResponse apply_code_action_response = 43; ApplyCodeActionResponse apply_code_action_response = 44;
GetChannels get_channels = 44; GetChannels get_channels = 45;
GetChannelsResponse get_channels_response = 45; GetChannelsResponse get_channels_response = 46;
JoinChannel join_channel = 46; JoinChannel join_channel = 47;
JoinChannelResponse join_channel_response = 47; JoinChannelResponse join_channel_response = 48;
LeaveChannel leave_channel = 48; LeaveChannel leave_channel = 49;
SendChannelMessage send_channel_message = 49; SendChannelMessage send_channel_message = 50;
SendChannelMessageResponse send_channel_message_response = 50; SendChannelMessageResponse send_channel_message_response = 51;
ChannelMessageSent channel_message_sent = 51; ChannelMessageSent channel_message_sent = 52;
GetChannelMessages get_channel_messages = 52; GetChannelMessages get_channel_messages = 53;
GetChannelMessagesResponse get_channel_messages_response = 53; GetChannelMessagesResponse get_channel_messages_response = 54;
UpdateContacts update_contacts = 54; UpdateContacts update_contacts = 55;
GetUsers get_users = 55; GetUsers get_users = 56;
GetUsersResponse get_users_response = 56; GetUsersResponse get_users_response = 57;
} }
} }
@ -78,6 +79,10 @@ message Error {
string message = 1; string message = 1;
} }
message Test {
uint64 id = 1;
}
message RegisterProject {} message RegisterProject {}
message RegisterProjectResponse { message RegisterProjectResponse {

59
crates/rpc/src/peer.rs
View file

@ -395,40 +395,18 @@ mod tests {
assert_eq!( assert_eq!(
client1 client1
.request( .request(client1_conn_id, proto::Test { id: 1 },)
client1_conn_id,
proto::OpenBuffer {
project_id: 0,
worktree_id: 1,
path: "path/one".to_string(),
},
)
.await .await
.unwrap(), .unwrap(),
proto::OpenBufferResponse { proto::Test { id: 1 }
buffer: Some(proto::Buffer {
variant: Some(proto::buffer::Variant::Id(0))
}),
}
); );
assert_eq!( assert_eq!(
client2 client2
.request( .request(client2_conn_id, proto::Test { id: 2 })
client2_conn_id,
proto::OpenBuffer {
project_id: 0,
worktree_id: 2,
path: "path/two".to_string(),
},
)
.await .await
.unwrap(), .unwrap(),
proto::OpenBufferResponse { proto::Test { id: 2 }
buffer: Some(proto::Buffer {
variant: Some(proto::buffer::Variant::Id(1))
})
}
); );
client1.disconnect(client1_conn_id); client1.disconnect(client1_conn_id);
@ -443,34 +421,9 @@ mod tests {
if let Some(envelope) = envelope.downcast_ref::<TypedEnvelope<proto::Ping>>() { if let Some(envelope) = envelope.downcast_ref::<TypedEnvelope<proto::Ping>>() {
let receipt = envelope.receipt(); let receipt = envelope.receipt();
peer.respond(receipt, proto::Ack {})? peer.respond(receipt, proto::Ack {})?
} else if let Some(envelope) = } else if let Some(envelope) = envelope.downcast_ref::<TypedEnvelope<proto::Test>>()
envelope.downcast_ref::<TypedEnvelope<proto::OpenBuffer>>()
{ {
let message = &envelope.payload; peer.respond(envelope.receipt(), envelope.payload.clone())?
let receipt = envelope.receipt();
let response = match message.path.as_str() {
"path/one" => {
assert_eq!(message.worktree_id, 1);
proto::OpenBufferResponse {
buffer: Some(proto::Buffer {
variant: Some(proto::buffer::Variant::Id(0)),
}),
}
}
"path/two" => {
assert_eq!(message.worktree_id, 2);
proto::OpenBufferResponse {
buffer: Some(proto::Buffer {
variant: Some(proto::buffer::Variant::Id(1)),
}),
}
}
_ => {
panic!("unexpected path {}", message.path);
}
};
peer.respond(receipt, response)?
} else { } else {
panic!("unknown message type"); panic!("unknown message type");
} }

2
crates/rpc/src/proto.rs
View file

@ -165,6 +165,7 @@ messages!(
SendChannelMessageResponse, SendChannelMessageResponse,
ShareProject, ShareProject,
ShareWorktree, ShareWorktree,
Test,
UnregisterProject, UnregisterProject,
UnregisterWorktree, UnregisterWorktree,
UnshareProject, UnshareProject,
@ -198,6 +199,7 @@ request_messages!(
(SendChannelMessage, SendChannelMessageResponse), (SendChannelMessage, SendChannelMessageResponse),
(ShareProject, Ack), (ShareProject, Ack),
(ShareWorktree, Ack), (ShareWorktree, Ack),
(Test, Test),
(UpdateBuffer, Ack), (UpdateBuffer, Ack),
(UpdateWorktree, Ack), (UpdateWorktree, Ack),
); );