style: fix formatting for CI (taplo + cargo fmt)

This commit is contained in:
2026-01-21 00:45:55 +03:00
parent 9488461380
commit 365bb238b3
3 changed files with 89 additions and 1976 deletions
+7 -1888
View File
File diff suppressed because it is too large Load Diff
+77 -87
View File
@@ -17,123 +17,113 @@ use tracing_subscriber::FmtSubscriber;
#[command(version)] #[command(version)]
#[command(about = "Network orchestration tool for Pezkuwi blockchain testing", long_about = None)] #[command(about = "Network orchestration tool for Pezkuwi blockchain testing", long_about = None)]
struct Cli { struct Cli {
/// Enable verbose output /// Enable verbose output
#[arg(short, long, global = true)] #[arg(short, long, global = true)]
verbose: bool, verbose: bool,
#[command(subcommand)] #[command(subcommand)]
command: Commands, command: Commands,
} }
#[derive(Subcommand, Debug)] #[derive(Subcommand, Debug)]
enum Commands { enum Commands {
/// Spawn a new network from a configuration file /// Spawn a new network from a configuration file
Spawn { Spawn {
/// Path to the TOML configuration file /// Path to the TOML configuration file
#[arg(value_name = "CONFIG_FILE")] #[arg(value_name = "CONFIG_FILE")]
config: PathBuf, config: PathBuf,
/// Provider to use for spawning the network /// Provider to use for spawning the network
#[arg(short, long, value_enum, default_value = "native")] #[arg(short, long, value_enum, default_value = "native")]
provider: Provider, provider: Provider,
}, },
} }
#[derive(ValueEnum, Clone, Debug)] #[derive(ValueEnum, Clone, Debug)]
enum Provider { enum Provider {
/// Run nodes directly as native processes /// Run nodes directly as native processes
Native, Native,
/// Run nodes in Docker containers /// Run nodes in Docker containers
Docker, Docker,
/// Run nodes in Kubernetes /// Run nodes in Kubernetes
K8s, K8s,
} }
#[tokio::main] #[tokio::main]
async fn main() -> Result<()> { async fn main() -> Result<()> {
let cli = Cli::parse(); let cli = Cli::parse();
// Set up tracing/logging // Set up tracing/logging
let level = if cli.verbose { Level::DEBUG } else { Level::INFO }; let level = if cli.verbose { Level::DEBUG } else { Level::INFO };
let subscriber = FmtSubscriber::builder() let subscriber = FmtSubscriber::builder()
.with_max_level(level) .with_max_level(level)
.with_target(false) .with_target(false)
.with_thread_ids(false) .with_thread_ids(false)
.with_file(false) .with_file(false)
.with_line_number(false) .with_line_number(false)
.finish(); .finish();
tracing::subscriber::set_global_default(subscriber) tracing::subscriber::set_global_default(subscriber)
.context("Failed to set tracing subscriber")?; .context("Failed to set tracing subscriber")?;
match cli.command { match cli.command {
Commands::Spawn { config, provider } => { Commands::Spawn { config, provider } => {
spawn_network(config, provider).await?; spawn_network(config, provider).await?;
} },
} }
Ok(()) Ok(())
} }
async fn spawn_network(config_path: PathBuf, provider: Provider) -> Result<()> { async fn spawn_network(config_path: PathBuf, provider: Provider) -> Result<()> {
let config_str = config_path let config_str = config_path.to_str().context("Invalid config path")?;
.to_str()
.context("Invalid config path")?;
info!("Loading network configuration from: {}", config_str); info!("Loading network configuration from: {}", config_str);
let network_config = NetworkConfig::load_from_toml(config_str) let network_config = NetworkConfig::load_from_toml(config_str)
.context("Failed to load network configuration")?; .context("Failed to load network configuration")?;
info!("Network configuration loaded successfully"); info!("Network configuration loaded successfully");
info!("Relay chain: {}", network_config.relaychain().chain().as_str()); info!("Relay chain: {}", network_config.relaychain().chain().as_str());
info!("Teyrchains: {}", network_config.teyrchains().len()); info!("Teyrchains: {}", network_config.teyrchains().len());
info!("Spawning network with provider: {:?}", provider); info!("Spawning network with provider: {:?}", provider);
let network = match provider { let network = match provider {
Provider::Native => { Provider::Native => {
info!("Using native provider (direct process spawning)"); info!("Using native provider (direct process spawning)");
network_config.spawn_native().await network_config.spawn_native().await
} },
Provider::Docker => { Provider::Docker => {
info!("Using Docker provider"); info!("Using Docker provider");
network_config.spawn_docker().await network_config.spawn_docker().await
} },
Provider::K8s => { Provider::K8s => {
info!("Using Kubernetes provider"); info!("Using Kubernetes provider");
network_config.spawn_k8s().await network_config.spawn_k8s().await
} },
} }
.context("Failed to spawn network")?; .context("Failed to spawn network")?;
info!("Network spawned successfully!"); info!("Network spawned successfully!");
// Print node information // Print node information
for node in network.relaychain().nodes() { for node in network.relaychain().nodes() {
info!( info!("Relay node '{}' running at {}", node.name(), node.ws_uri());
"Relay node '{}' running at {}", }
node.name(),
node.ws_uri()
);
}
for para in network.parachains() { for para in network.parachains() {
info!("Teyrchain ID {}", para.para_id()); info!("Teyrchain ID {}", para.para_id());
for collator in para.collators() { for collator in para.collators() {
info!( info!(" Collator '{}' running at {}", collator.name(), collator.ws_uri());
" Collator '{}' running at {}", }
collator.name(), }
collator.ws_uri()
);
}
}
info!("Press Ctrl+C to stop the network..."); info!("Press Ctrl+C to stop the network...");
// Keep the network running until interrupted // Keep the network running until interrupted
tokio::signal::ctrl_c().await?; tokio::signal::ctrl_c().await?;
info!("Shutting down network..."); info!("Shutting down network...");
Ok(()) Ok(())
} }
@@ -114,7 +114,11 @@ pub struct TeyrchainConfig {
chain: Option<Chain>, chain: Option<Chain>,
#[serde(flatten)] #[serde(flatten)]
registration_strategy: Option<RegistrationStrategy>, registration_strategy: Option<RegistrationStrategy>,
#[serde(skip_serializing_if = "super::utils::is_true", default = "default_as_true", alias = "onboard_as_parachain")] #[serde(
skip_serializing_if = "super::utils::is_true",
default = "default_as_true",
alias = "onboard_as_parachain"
)]
onboard_as_teyrchain: bool, onboard_as_teyrchain: bool,
#[serde(rename = "balance", default = "default_initial_balance")] #[serde(rename = "balance", default = "default_initial_balance")]
initial_balance: U128, initial_balance: U128,