Fix a typo on "neworks" -> "networks"
This commit is contained in:
@ -244,7 +244,7 @@ async fn handle_scan(
|
|||||||
|
|
||||||
let msg = EventBusWriterEvent::BroadcastMessage(
|
let msg = EventBusWriterEvent::BroadcastMessage(
|
||||||
WorkerMessages::DoWorkRequest {
|
WorkerMessages::DoWorkRequest {
|
||||||
neworks: vec![Network(cidr)],
|
networks: vec![Network(cidr)],
|
||||||
}
|
}
|
||||||
.into(),
|
.into(),
|
||||||
);
|
);
|
||||||
|
@ -271,7 +271,7 @@ impl<'a> Worker<'a> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
WorkerMessages::GetWorkRequest {} => {
|
WorkerMessages::GetWorkRequest {} => {
|
||||||
worker_reply = Some(WorkerMessages::DoWorkRequest { neworks: vec![] });
|
worker_reply = Some(WorkerMessages::DoWorkRequest { networks: vec![] });
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
WorkerMessages::DoWorkRequest { .. } | WorkerMessages::Invalid { .. } => {
|
WorkerMessages::DoWorkRequest { .. } | WorkerMessages::Invalid { .. } => {
|
||||||
|
@ -15,7 +15,7 @@ pub enum WorkerMessages {
|
|||||||
#[serde(rename = "get_work")]
|
#[serde(rename = "get_work")]
|
||||||
GetWorkRequest {},
|
GetWorkRequest {},
|
||||||
#[serde(rename = "do_work")]
|
#[serde(rename = "do_work")]
|
||||||
DoWorkRequest { neworks: Vec<Network> },
|
DoWorkRequest { networks: Vec<Network> },
|
||||||
#[serde(rename = "scanner_found")]
|
#[serde(rename = "scanner_found")]
|
||||||
ScannerFoundResponse { name: String, address: IpAddr },
|
ScannerFoundResponse { name: String, address: IpAddr },
|
||||||
#[serde(rename = "")]
|
#[serde(rename = "")]
|
||||||
@ -95,25 +95,25 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn deserialize_do_work_empty() {
|
fn deserialize_do_work_empty() {
|
||||||
let data = "{\"type\":\"do_work\",\"request\":{\"neworks\":[]}}";
|
let data = "{\"type\":\"do_work\",\"request\":{\"networks\":[]}}";
|
||||||
let result: WorkerMessages = data.to_string().into();
|
let result: WorkerMessages = data.to_string().into();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
result,
|
result,
|
||||||
WorkerMessages::DoWorkRequest {
|
WorkerMessages::DoWorkRequest {
|
||||||
neworks: [].to_vec()
|
networks: [].to_vec()
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn deserialize_do_work() {
|
fn deserialize_do_work() {
|
||||||
let data = "{\"type\":\"do_work\",\"request\":{\"neworks\":[\"127.0.0.0/31\"]}}";
|
let data = "{\"type\":\"do_work\",\"request\":{\"networks\":[\"127.0.0.0/31\"]}}";
|
||||||
let result: WorkerMessages = data.to_string().into();
|
let result: WorkerMessages = data.to_string().into();
|
||||||
let cidr: IpCidr = IpCidr::from_str("127.0.0.0/31").unwrap();
|
let cidr: IpCidr = IpCidr::from_str("127.0.0.0/31").unwrap();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
result,
|
result,
|
||||||
WorkerMessages::DoWorkRequest {
|
WorkerMessages::DoWorkRequest {
|
||||||
neworks: [Network(cidr)].to_vec()
|
networks: [Network(cidr)].to_vec()
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -195,9 +195,9 @@ impl Worker {
|
|||||||
|
|
||||||
pub fn receive_request(&mut self, server_request: WorkerMessages) -> &Worker {
|
pub fn receive_request(&mut self, server_request: WorkerMessages) -> &Worker {
|
||||||
match server_request {
|
match server_request {
|
||||||
WorkerMessages::DoWorkRequest { neworks } => {
|
WorkerMessages::DoWorkRequest { networks } => {
|
||||||
info!("Work request received for neworks: {:?}", neworks);
|
info!("Work request received for networks: {:?}", networks);
|
||||||
for cidr in neworks {
|
for cidr in networks {
|
||||||
let cidr = cidr.0;
|
let cidr = cidr.0;
|
||||||
self.work_on_cidr(cidr);
|
self.work_on_cidr(cidr);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user