Skip to content

Commit

Permalink
more clippy fixes (#44)
Browse files Browse the repository at this point in the history
* clippy fix

* silence test output
  • Loading branch information
hazel-sudz authored Dec 15, 2024
1 parent d834b9e commit 3571473
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 46 deletions.
22 changes: 11 additions & 11 deletions src/info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,37 +208,37 @@ impl RouterHandler for InfoRouter {
}

// Unused requests
fn handle_query_version_request(&self, req: &QueryVersionRequest) -> QueryVersionResponse {
fn handle_query_version_request(&self, _req: &QueryVersionRequest) -> QueryVersionResponse {
unimplemented!()
}
fn handle_read_request(&self, req: &ReadRequest) -> ReadResponse {
fn handle_read_request(&self, _req: &ReadRequest) -> ReadResponse {
unimplemented!()
}
fn handle_write_request(&self, req: &WriteRequest) -> WriteResponse {
fn handle_write_request(&self, _req: &WriteRequest) -> WriteResponse {
unimplemented!()
}
fn handle_get_version_request(&self, req: &GetVersionRequest) -> GetVersionResponse {
fn handle_get_version_request(&self, _req: &GetVersionRequest) -> GetVersionResponse {
unimplemented!();
}

// Unused responses
fn handle_announce_shard_response(&self, res: &AnnounceShardResponse) {
fn handle_announce_shard_response(&self, _res: &AnnounceShardResponse) {
unimplemented!()
}
fn handle_get_client_shard_info_response(&self, res: &GetClientShardInfoResponse) {
fn handle_get_client_shard_info_response(&self, _res: &GetClientShardInfoResponse) {
unimplemented!()
}
fn handle_query_version_response(&self, res: &QueryVersionResponse) {
fn handle_query_version_response(&self, _res: &QueryVersionResponse) {
unimplemented!()
}
fn handle_read_response(&self, res: &ReadResponse) {}
fn handle_write_response(&self, res: &WriteResponse) {
fn handle_read_response(&self, _res: &ReadResponse) {}
fn handle_write_response(&self, _res: &WriteResponse) {
unimplemented!()
}
fn handle_get_shared_peers_response(&self, res: &GetSharedPeersResponse) {
fn handle_get_shared_peers_response(&self, _res: &GetSharedPeersResponse) {
unimplemented!()
}
fn handle_get_version_response(&self, res: &GetVersionResponse) {
fn handle_get_version_response(&self, _res: &GetVersionResponse) {
unimplemented!()
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/integration/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ mod tests {
// the output is really noisy unless we need it for debugging
info_cmd
.arg("--write-shards=1")
.stdout(std::process::Stdio::inherit())
.stderr(std::process::Stdio::inherit())
.stdout(Stdio::null())
.stderr(Stdio::null())
.spawn()?;
read_cmd
.stdout(std::process::Stdio::inherit())
.stderr(std::process::Stdio::inherit())
.stdout(Stdio::null())
.stderr(Stdio::null())
.spawn()?;
write_cmd
.stdout(std::process::Stdio::inherit())
.stderr(std::process::Stdio::inherit())
.stdout(Stdio::null())
.stderr(Stdio::null())
.spawn()?;
tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;

Expand Down
5 changes: 2 additions & 3 deletions src/io/router.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::io::write::write_message;
use crate::messages::message::{AsAny, Message};
use crate::messages::message::Message;
use crate::messages::requests::get_shared_peers_request::GetSharedPeersRequest;
use crate::messages::responses::get_shared_peers_response::GetSharedPeersResponse;
use crate::messages::{
Expand Down Expand Up @@ -129,6 +129,7 @@ impl<H: RouterHandler> RouterBuilder<H> {
}
}

#[allow(unused)]
pub fn get_handler_arc(&self) -> Arc<H> {
self.handler.clone()
}
Expand Down Expand Up @@ -201,8 +202,6 @@ impl<H: RouterHandler> RouterBuilder<H> {

match peer {
V6(peer) => {
let msg_type = message.get_message_type();
// println!("(router) handling new message of type {:?}", msg_type);
match message.is_request() {
true => {
match message.get_message_type() {
Expand Down
26 changes: 13 additions & 13 deletions src/io/router_example.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,76 +28,76 @@ mod test {
/// Callback for handling new requests
fn handle_announce_shard_request(
&self,
req: &AnnounceShardRequest,
_req: &AnnounceShardRequest,
) -> AnnounceShardResponse {
unimplemented!()
}

fn handle_get_client_shard_info_request(
&self,
req: &GetClientShardInfoRequest,
_req: &GetClientShardInfoRequest,
) -> GetClientShardInfoResponse {
unimplemented!()
}

fn handle_query_version_request(&self, req: &QueryVersionRequest) -> QueryVersionResponse {
fn handle_query_version_request(&self, _req: &QueryVersionRequest) -> QueryVersionResponse {
unimplemented!()
}

fn handle_read_request(&self, req: &ReadRequest) -> ReadResponse {
fn handle_read_request(&self, _req: &ReadRequest) -> ReadResponse {
ReadResponse {
value: vec![1, 2, 3, 4],
key: b"testkey".to_vec(),
error: 0,
}
}

fn handle_write_request(&self, req: &WriteRequest) -> WriteResponse {
fn handle_write_request(&self, _req: &WriteRequest) -> WriteResponse {
unimplemented!()
}

fn handle_get_shared_peers_request(
&self,
req: &GetSharedPeersRequest,
_req: &GetSharedPeersRequest,
) -> GetSharedPeersResponse {
unimplemented!()
}

/// Callbacks for handling responses to outbound requests
fn handle_announce_shard_response(&self, res: &AnnounceShardResponse) {
fn handle_announce_shard_response(&self, _res: &AnnounceShardResponse) {
unimplemented!()
}

fn handle_get_client_shard_info_response(&self, res: &GetClientShardInfoResponse) {
fn handle_get_client_shard_info_response(&self, _res: &GetClientShardInfoResponse) {
unimplemented!()
}

fn handle_query_version_response(&self, res: &QueryVersionResponse) {
fn handle_query_version_response(&self, _res: &QueryVersionResponse) {
unimplemented!()
}

fn handle_read_response(&self, res: &ReadResponse) {
self.debug_out.write().unwrap().push(res.value.clone());
}

fn handle_write_response(&self, res: &WriteResponse) {
fn handle_write_response(&self, _res: &WriteResponse) {
unimplemented!()
}

fn handle_get_shared_peers_response(&self, res: &GetSharedPeersResponse) {
fn handle_get_shared_peers_response(&self, _res: &GetSharedPeersResponse) {
unimplemented!()
}

fn handle_get_version_request(
&self,
req: &crate::messages::requests::get_version_request::GetVersionRequest,
_req: &crate::messages::requests::get_version_request::GetVersionRequest,
) -> crate::messages::responses::get_version_response::GetVersionResponse {
unimplemented!()
}

fn handle_get_version_response(
&self,
res: &crate::messages::responses::get_version_response::GetVersionResponse,
_res: &crate::messages::responses::get_version_response::GetVersionResponse,
) {
unimplemented!()
}
Expand Down
1 change: 0 additions & 1 deletion src/io/write.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ pub async fn write_message<T: MessagePayload>(
) -> Result<()> {
let serialized = message.serialize()?;
let serialized_buf = serialized.as_bytes();
let written = serialized_buf.len();
stream.write_all(serialized_buf).await?;
stream.flush().await?;
// println!("finished writing {written} bytes!");
Expand Down
4 changes: 0 additions & 4 deletions src/messages/message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,6 @@ pub fn bytes_as_message(buffer: &[u8]) -> Result<Box<dyn MessagePayload>> {
true => Box::new(Message::<GetVersionRequest>::deserialize(buffer)?.message_payload),
false => Box::new(Message::<GetVersionResponse>::deserialize(buffer)?.message_payload),
},
_ => {
println!("failed to parse");
return Err(anyhow::anyhow!("unsupported message type"));
}
};
Ok(result)
}
Expand Down
1 change: 1 addition & 0 deletions src/utils/constants.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use std::net::{Ipv6Addr, SocketAddrV6};

#[allow(unused)]
pub static MAIN_INSTANCE_IP_PORT: SocketAddrV6 = SocketAddrV6::new(Ipv6Addr::LOCALHOST, 8080, 0, 0);
18 changes: 10 additions & 8 deletions src/utils/test_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use crate::messages::{
};

/// A helper struct to use in testing. It stores any outbound responses so they can be asserted in unit tests
#[allow(unused)]
pub struct TestRouterClient {
pub query_version_responses: Arc<Mutex<Vec<QueryVersionResponse>>>,
pub announce_shard_responses: Arc<Mutex<Vec<AnnounceShardResponse>>>,
Expand All @@ -30,6 +31,7 @@ pub struct TestRouterClient {
router: RouterBuilder<TestRouterClientHandler>,
}

#[allow(unused)]
impl TestRouterClient {
pub fn new() -> Self {
let query_version_responses = Arc::new(Mutex::new(Vec::new()));
Expand Down Expand Up @@ -75,46 +77,46 @@ pub struct TestRouterClientHandler {
}

impl RouterHandler for TestRouterClientHandler {
fn handle_announce_shard_request(&self, req: &AnnounceShardRequest) -> AnnounceShardResponse {
fn handle_announce_shard_request(&self, _req: &AnnounceShardRequest) -> AnnounceShardResponse {
unimplemented!()
}

fn handle_get_client_shard_info_request(
&self,
req: &GetClientShardInfoRequest,
_req: &GetClientShardInfoRequest,
) -> GetClientShardInfoResponse {
unimplemented!()
}

fn handle_query_version_request(&self, req: &QueryVersionRequest) -> QueryVersionResponse {
fn handle_query_version_request(&self, _req: &QueryVersionRequest) -> QueryVersionResponse {
unimplemented!()
}

fn handle_read_request(&self, req: &ReadRequest) -> ReadResponse {
fn handle_read_request(&self, _req: &ReadRequest) -> ReadResponse {
unimplemented!()
}

fn handle_write_request(&self, req: &WriteRequest) -> WriteResponse {
fn handle_write_request(&self, _req: &WriteRequest) -> WriteResponse {
unimplemented!()
}

fn handle_get_shared_peers_request(
&self,
req: &GetSharedPeersRequest,
_req: &GetSharedPeersRequest,
) -> GetSharedPeersResponse {
unimplemented!()
}

fn handle_get_version_request(
&self,
req: &crate::messages::requests::get_version_request::GetVersionRequest,
_req: &crate::messages::requests::get_version_request::GetVersionRequest,
) -> crate::messages::responses::get_version_response::GetVersionResponse {
unimplemented!()
}

fn handle_get_version_response(
&self,
res: &crate::messages::responses::get_version_response::GetVersionResponse,
_res: &crate::messages::responses::get_version_response::GetVersionResponse,
) {
unimplemented!()
}
Expand Down

0 comments on commit 3571473

Please sign in to comment.