mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-26 20:27:58 +00:00
Cecile Tonglet
e8000e7429
Related to #4776 Related to https://github.com/paritytech/polkadot/pull/832 To summarize the changes: 1. I did not manage to validate with types the service's Configuration. But I did reduce the possibility of errors by moving all the "fill" functions to their respective structopts 2. I split params.rs to multiple modules: one module params for just CLI parameters and one module commands for CLI subcommands (and RunCmd). Every command and params are in their own file so things are grouped better together and easier to remove 3. I removed the run and run_subcommand helpers as they are not helping much anymore. Running a command is always a set of 3 commands: 1. init 2. update config 3. run. This still allow the user to change the config before arguments get parsed or right after. 4. I added tests for all subcommands. 5. [deleted] Overall the aim is to improve the situation with the Configuration and the optional parameters, add tests, make the API more consistent and simpler.
65 lines
2.0 KiB
Rust
65 lines
2.0 KiB
Rust
// Copyright 2020 Parity Technologies (UK) Ltd.
|
|
// This file is part of Substrate.
|
|
|
|
// Substrate is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Substrate is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
#![cfg(unix)]
|
|
#![allow(dead_code)]
|
|
|
|
use std::{process::{Child, ExitStatus}, thread, time::Duration, path::Path};
|
|
use assert_cmd::cargo::cargo_bin;
|
|
use std::{convert::TryInto, process::Command};
|
|
use nix::sys::signal::{kill, Signal::SIGINT};
|
|
use nix::unistd::Pid;
|
|
|
|
/// Wait for the given `child` the given number of `secs`.
|
|
///
|
|
/// Returns the `Some(exit status)` or `None` if the process did not finish in the given time.
|
|
pub fn wait_for(child: &mut Child, secs: usize) -> Option<ExitStatus> {
|
|
for _ in 0..secs {
|
|
match child.try_wait().unwrap() {
|
|
Some(status) => return Some(status),
|
|
None => thread::sleep(Duration::from_secs(1)),
|
|
}
|
|
}
|
|
eprintln!("Took to long to exit. Killing...");
|
|
let _ = child.kill();
|
|
child.wait().unwrap();
|
|
|
|
None
|
|
}
|
|
|
|
/// Run the node for a while (30 seconds)
|
|
pub fn run_command_for_a_while(base_path: &Path, dev: bool) {
|
|
let mut cmd = Command::new(cargo_bin("substrate"));
|
|
|
|
if dev {
|
|
cmd.arg("--dev");
|
|
}
|
|
|
|
let mut cmd = cmd
|
|
.arg("-d")
|
|
.arg(base_path)
|
|
.spawn()
|
|
.unwrap();
|
|
|
|
// Let it produce some blocks.
|
|
thread::sleep(Duration::from_secs(30));
|
|
assert!(cmd.try_wait().unwrap().is_none(), "the process should still be running");
|
|
|
|
// Stop the process
|
|
kill(Pid::from_raw(cmd.id().try_into().unwrap()), SIGINT).unwrap();
|
|
assert!(wait_for(&mut cmd, 20).map(|x| x.success()).unwrap_or_default());
|
|
}
|