diff --git a/simulator/Cargo.toml b/simulator/Cargo.toml index 1b3da22f8..c562ad9ca 100644 --- a/simulator/Cargo.toml +++ b/simulator/Cargo.toml @@ -19,7 +19,7 @@ anyhow = { workspace = true } clap = { workspace = true } hex = { workspace = true } rand = { workspace = true } -serde = { workspace = true } +serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } tycho-util = { workspace = true } diff --git a/simulator/src/compose.rs b/simulator/src/compose.rs index 8e44118ba..7b4883cb2 100644 --- a/simulator/src/compose.rs +++ b/simulator/src/compose.rs @@ -3,7 +3,6 @@ use std::ffi::OsStr; use std::path::PathBuf; use std::process::{Command, Output, Stdio}; use std::str; -use std::str::FromStr; use anyhow::{Context, Result}; use serde::{Deserialize, Serialize}; @@ -152,7 +151,7 @@ impl ComposeRunner { for i in self.get_running_nodes_list()? { println!("node {i}"); let index = i - .split("-") + .split('-') .collect::>() .last() .unwrap() @@ -175,7 +174,7 @@ impl ComposeRunner { let output = self.execute_compose_command(&docker_compose_command)?; let x = String::from_utf8(output.stdout)? .trim() - .split("\n") + .lines() .map(|x| x.to_string()) .collect(); Ok(x) diff --git a/simulator/src/main.rs b/simulator/src/main.rs index 1c586e3aa..0d9969972 100644 --- a/simulator/src/main.rs +++ b/simulator/src/main.rs @@ -1,4 +1,4 @@ -#![allow(clippy::unused_self)] +#![allow(clippy::unused_self, clippy::print_stdout, clippy::print_stderr)] use std::process::Command; diff --git a/simulator/src/simulator.rs b/simulator/src/simulator.rs index e979e47d4..b9d1c3154 100644 --- a/simulator/src/simulator.rs +++ b/simulator/src/simulator.rs @@ -1,11 +1,10 @@ use std::net::Ipv4Addr; use std::os::unix::fs::PermissionsExt; -use std::str::FromStr; use anyhow::{Context, Result}; use serde::{Deserialize, Serialize}; -use crate::compose::{ComposeRunner, Service}; +use crate::compose::ComposeRunner; use crate::config::ServiceConfig; use crate::node::{Node, NodeOptions}; @@ -41,7 +40,7 @@ impl Simulator { let mut ips = Vec::new(); for node_index in 0..nodes { let ip = self.add_node(node_index, None, None)?; - ips.push(ip) + ips.push(ip); } //self.add_grafana()?; @@ -133,7 +132,7 @@ datasources: editable: true "#; let grafana_datasource_config = self.config.grafana().join("datasource.yml"); - std::fs::write(&grafana_datasource_config, grafana_data) + std::fs::write(grafana_datasource_config, grafana_data) .context("Failed to write grafana data")?; Ok(()) @@ -172,7 +171,7 @@ scrape_configs: nodes ); let prometheus_datasource_config = self.config.prometheus().join("prometheus.yml"); - std::fs::write(&prometheus_datasource_config, prometheus_data) + std::fs::write(prometheus_datasource_config, prometheus_data) .context("Failed to write prometheus data")?; Ok(()) }