mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-30 09:37:55 +00:00
ead6815ae4
* Make WASM browser thing compile * Fix * updated exit-future (github repo) * Switch to broadcast crate * Migrate client/cli * Switch exit-future to modernize branch * Small changes * Switch to cargo version and fix fg tests * fix basic-authorship * Fix crash on grafana macro * Fix grafana macro * Switch node python version * Disable record_metrics_slice in grafana macro on wasm * Update client/grafana-data-source/src/lib.rs * Revert "Update client/grafana-data-source/src/lib.rs" This reverts commit 888009a8e0b7051bd4bfbbfdb0448bcf2e2aae93. * Add wasm support for state machine * Switch to my own libp2p version * Revert "Switch to my own libp2p version" This reverts commit ce613871b59264b3165b45c37943e6560240daa7. * Revert "Add wasm support for state machine" This reverts commit de7eaa0694d9534fc3b164621737968e9a6a7c5f. * Add sc-browser * Squash * remove sc-browser * Fix keystore on wasm * stubs for removed functions to make env compatible with old runtimes * Add test (that doesn't work) * Fix build scripts * Revert basic-authorship due to no panics * Revert cli/informant * Revert consensus * revert offchain * Update utils/browser/Cargo.toml Co-Authored-By: Benjamin Kampmann <ben@gnunicorn.org> * export console functions * Add new chainspec * Fix ws in chain spec * revert chainspec * Fix chainspec * Use an Option<PathBuf> in keystore instead of cfg flags * Remove crud * Only use wasm-timer for instant and systemtime * Remove telemetry changes * Assuming this is ok * Add a KeystoreConfig * Add stubs back in * Update libp2p * Revert "Add stubs back in" This reverts commit 4690cf1882aa0f99f7f00a58c4080c8aa9b77c36. * Remove commented js again * Bump kvdb-web version * Fix cli * Switch branch on futures-timer * Fix tests * Remove sc-client test build in check-web-wasm because there isn't a good way to build futures-timer with wasm-bindgen support in the build * Remove more things ^^ * Switch branch on futures-timer back * Put DB io stats behind a cfg flag * Fix things * Don't timeout transports on wasm * Update branch of futures-timer and fix bad merge * Spawn informant * Fix network test * Fix delay resets * Changes * Fix tests * use wasm_timer for transaction pool * Fixes * Switch futures-timer to crates * Only diagnose futures on native * Fix sc-network-test tests * Select log level in js * Fix syncing ;^) * Allow disabling colours in the informant * Use OutputFormat enum for informant * MallocSizeOf impl on transaction pool broke stuff because wasm_timer::Instant doesnt impl it so just revert the transaction pool to master * Update futures-diagnose * Revert "MallocSizeOf impl on transaction pool broke stuff because wasm_timer::Instant doesnt impl it so just revert the transaction pool to master" This reverts commit baa4ffc94fd968b6660a2c17ba8113e06af15548. * Pass whole chain spec in start_client * Get Instant::now to work in transaction pool again * Informant dep reordering Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com> Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> Co-authored-by: Svyatoslav Nikolsky <svyatonik@gmail.com> Co-authored-by: Benjamin Kampmann <ben.kampmann@googlemail.com> Co-authored-by: Demi Obenour <48690212+DemiMarie-parity@users.noreply.github.com>
140 lines
3.6 KiB
Rust
140 lines
3.6 KiB
Rust
// Copyright 2017-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/>.
|
|
|
|
use std::sync::Arc;
|
|
|
|
use futures::{Future, future, future::FutureExt};
|
|
use futures::select;
|
|
use futures::pin_mut;
|
|
use sc_service::{AbstractService, Configuration};
|
|
use crate::error;
|
|
|
|
#[cfg(target_family = "unix")]
|
|
async fn main<F, E>(func: F) -> Result<(), Box<dyn std::error::Error>>
|
|
where
|
|
F: Future<Output = Result<(), E>> + future::FusedFuture,
|
|
E: 'static + std::error::Error,
|
|
{
|
|
use tokio::signal::unix::{signal, SignalKind};
|
|
|
|
let mut stream_int = signal(SignalKind::interrupt())?;
|
|
let mut stream_term = signal(SignalKind::terminate())?;
|
|
|
|
let t1 = stream_int.recv().fuse();
|
|
let t2 = stream_term.recv().fuse();
|
|
let t3 = func;
|
|
|
|
pin_mut!(t1, t2, t3);
|
|
|
|
select! {
|
|
_ = t1 => {},
|
|
_ = t2 => {},
|
|
res = t3 => res?,
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(not(unix))]
|
|
async fn main<F, E>(func: F) -> Result<(), Box<dyn std::error::Error>>
|
|
where
|
|
F: Future<Output = Result<(), E>> + future::FusedFuture,
|
|
E: 'static + std::error::Error,
|
|
{
|
|
use tokio::signal::ctrl_c;
|
|
|
|
let t1 = ctrl_c().fuse();
|
|
let t2 = func;
|
|
|
|
pin_mut!(t1, t2);
|
|
|
|
select! {
|
|
_ = t1 => {},
|
|
res = t2 => res?,
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
fn build_runtime() -> Result<tokio::runtime::Runtime, std::io::Error> {
|
|
tokio::runtime::Builder::new()
|
|
.thread_name("main-tokio-")
|
|
.threaded_scheduler()
|
|
.enable_all()
|
|
.build()
|
|
}
|
|
|
|
/// A helper function that runs a future with tokio and stops if the process receives the signal
|
|
/// SIGTERM or SIGINT
|
|
pub fn run_until_exit<FUT, ERR, G, E, F>(
|
|
mut config: Configuration<G, E>,
|
|
future_builder: F,
|
|
) -> error::Result<()>
|
|
where
|
|
F: FnOnce(Configuration<G, E>) -> error::Result<FUT>,
|
|
FUT: Future<Output = Result<(), ERR>> + future::Future,
|
|
ERR: 'static + std::error::Error,
|
|
{
|
|
let mut runtime = build_runtime()?;
|
|
|
|
config.task_executor = {
|
|
let runtime_handle = runtime.handle().clone();
|
|
Some(Arc::new(move |fut| { runtime_handle.spawn(fut); }))
|
|
};
|
|
|
|
let f = future_builder(config)?;
|
|
let f = f.fuse();
|
|
pin_mut!(f);
|
|
|
|
runtime.block_on(main(f)).map_err(|e| e.to_string())?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// A helper function that runs an `AbstractService` with tokio and stops if the process receives
|
|
/// the signal SIGTERM or SIGINT
|
|
pub fn run_service_until_exit<T, G, E, F>(
|
|
mut config: Configuration<G, E>,
|
|
service_builder: F,
|
|
) -> error::Result<()>
|
|
where
|
|
F: FnOnce(Configuration<G, E>) -> Result<T, sc_service::error::Error>,
|
|
T: AbstractService + Unpin,
|
|
{
|
|
let mut runtime = build_runtime()?;
|
|
|
|
config.task_executor = {
|
|
let runtime_handle = runtime.handle().clone();
|
|
Some(Arc::new(move |fut| { runtime_handle.spawn(fut); }))
|
|
};
|
|
|
|
let service = service_builder(config)?;
|
|
|
|
let informant_future = sc_informant::build(&service, sc_informant::OutputFormat::Coloured);
|
|
let _informant_handle = runtime.spawn(informant_future);
|
|
|
|
// we eagerly drop the service so that the internal exit future is fired,
|
|
// but we need to keep holding a reference to the global telemetry guard
|
|
let _telemetry = service.telemetry();
|
|
|
|
let f = service.fuse();
|
|
pin_mut!(f);
|
|
|
|
runtime.block_on(main(f)).map_err(|e| e.to_string())?;
|
|
|
|
Ok(())
|
|
}
|