Merge pull request #141 from koushiro/update-xtra

Update xtra to v0.5.0-rc.1

Author: niklasad1

Cargo.lock

@@ -4,22 +4,17 @@ version = "0.2.1"
 authors = ["Andrew Plaza <aplaza@liquidthink.net>"]
 edition = "2018"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
-substrate-archive = { path = "../../substrate-archive", features = ["logging"] }
-substrate-archive-common = { path = "../../substrate-archive-common" }
-substrate-archive-backend = { path = "../../substrate-archive-backend" }
-node-template-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-node-template = { git = "https://github.com/paritytech/substrate", branch = "master" }
-
+anyhow = "1.0"
 clap = { version = "2.33.1", features = ["yaml", "suggestions", "color"] }
-toml = "0.5"
-futures = "0.3.5"
+ctrlc = { version = "3.1.5", features = ["termination"] }
 log = "0.4"
-pretty_env_logger = "0.4.0"
-anyhow = "1.0.31"
 serde = "1.0"
-ctrlc = { version = "3.1.5", features = ["termination"] }
+toml = "0.5"
+
+node-template-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+node-template = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
-[features]
+substrate-archive = { path = "../../substrate-archive", features = ["logging"] }
+substrate-archive-common = { path = "../../substrate-archive-common" }
+substrate-archive-backend = { path = "../../substrate-archive-backend" }

bin/node-template-archive/Cargo.lock

@@ -14,53 +14,52 @@
 // You should have received a copy of the GNU General Public License
 // along with substrate-archive.  If not, see <http://www.gnu.org/licenses/>.
 
-use clap::{load_yaml, App};
 use std::path::PathBuf;
 
+use clap::{load_yaml, App};
+
 #[derive(Clone)]
 pub struct CliOpts {
-    pub file: PathBuf,
-    pub log_level: log::LevelFilter,
-    pub chain_spec: node_template::chain_spec::ChainSpec,
+	pub file: PathBuf,
+	pub log_level: log::LevelFilter,
+	pub chain_spec: node_template::chain_spec::ChainSpec,
 }
 
 impl CliOpts {
-    pub fn parse() -> Self {
-        let yaml = load_yaml!("cli_opts.yaml");
-        let matches = App::from(yaml).get_matches();
-        let log_level = match matches.occurrences_of("verbose") {
-            0 => log::LevelFilter::Info,
-            1 => log::LevelFilter::Info,
-            2 => log::LevelFilter::Info,
-            3 => log::LevelFilter::Debug,
-            4 | _ => log::LevelFilter::Trace,
-        };
-        let file = matches
-            .value_of("config")
-            .expect("Config is a required value");
-        let chain_spec;
-        let spec = matches.value_of("spec");
-        if spec.is_some() {
-            match spec {
-                Some("dev") => {
-                    chain_spec = node_template::chain_spec::development_config();
-                }
-                Some("") | Some("local") => {
-                    chain_spec = node_template::chain_spec::local_testnet_config();
-                }
-                path => {
-                    chain_spec = node_template::chain_spec::ChainSpec::from_json_file(
-                        std::path::PathBuf::from(path.expect("checked for existence; qed")),
-                    )
-                }
-            }
-        } else {
-            panic!("Chain spec could not be loaded; is the path correct?")
-        }
-        CliOpts {
-            file: PathBuf::from(file),
-            log_level,
-            chain_spec: chain_spec.expect("Chain spec could not be loaded"),
-        }
-    }
+	pub fn parse() -> Self {
+		let yaml = load_yaml!("cli_opts.yaml");
+		let matches = App::from(yaml).get_matches();
+		let log_level = match matches.occurrences_of("verbose") {
+			0 => log::LevelFilter::Info,
+			1 => log::LevelFilter::Info,
+			2 => log::LevelFilter::Info,
+			3 => log::LevelFilter::Debug,
+			4 | _ => log::LevelFilter::Trace,
+		};
+		let file = matches.value_of("config").expect("Config is a required value");
+		let chain_spec;
+		let spec = matches.value_of("spec");
+		if spec.is_some() {
+			match spec {
+				Some("dev") => {
+					chain_spec = node_template::chain_spec::development_config();
+				}
+				Some("") | Some("local") => {
+					chain_spec = node_template::chain_spec::local_testnet_config();
+				}
+				path => {
+					chain_spec = node_template::chain_spec::ChainSpec::from_json_file(std::path::PathBuf::from(
+						path.expect("checked for existence; qed"),
+					))
+				}
+			}
+		} else {
+			panic!("Chain spec could not be loaded; is the path correct?")
+		}
+		CliOpts {
+			file: PathBuf::from(file),
+			log_level,
+			chain_spec: chain_spec.expect("Chain spec could not be loaded"),
+		}
+	}
 }

bin/node-template-archive/Cargo.toml

@@ -14,85 +14,88 @@
 // You should have received a copy of the GNU General Public License
 // along with substrate-archive.  If not, see <http://www.gnu.org/licenses/>.
 
-use super::cli_opts::CliOpts;
+use std::path::{Path, PathBuf};
+
 use anyhow::Result;
 use serde::{Deserialize, Serialize};
-use std::path::{Path, PathBuf};
+
 use substrate_archive::MigrationConfig;
 
+use crate::cli_opts::CliOpts;
+
 #[derive(Clone)]
 pub struct Config {
-    db_path: PathBuf,
-    psql_conf: MigrationConfig,
-    cli: CliOpts,
-    cache_size: Option<usize>,
-    block_workers: Option<usize>,
-    wasm_pages: Option<u64>,
+	db_path: PathBuf,
+	psql_conf: MigrationConfig,
+	cli: CliOpts,
+	cache_size: Option<usize>,
+	block_workers: Option<usize>,
+	wasm_pages: Option<u64>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 struct TomlConfig {
-    db_path: PathBuf,
-    cache_size: Option<usize>,
-    block_workers: Option<usize>,
-    wasm_pages: Option<u64>,
-    db_host: Option<String>,
-    db_port: Option<String>,
-    db_user: Option<String>,
-    db_pass: Option<String>,
-    db_name: Option<String>,
+	db_path: PathBuf,
+	cache_size: Option<usize>,
+	block_workers: Option<usize>,
+	wasm_pages: Option<u64>,
+	db_host: Option<String>,
+	db_port: Option<String>,
+	db_user: Option<String>,
+	db_pass: Option<String>,
+	db_name: Option<String>,
 }
 
 impl Config {
-    pub fn new() -> Result<Self> {
-        let cli_opts = CliOpts::parse();
-        let toml_conf = Self::parse_file(cli_opts.file.as_path())?;
-        log::debug!("{:?}", toml_conf);
-
-        let psql_conf = MigrationConfig {
-            host: toml_conf.db_host.clone(),
-            port: toml_conf.db_port.clone(),
-            user: toml_conf.db_user.clone(),
-            pass: toml_conf.db_pass.clone(),
-            name: toml_conf.db_name.clone(),
-        };
-
-        Ok(Self {
-            db_path: toml_conf.db_path,
-            psql_conf,
-            cli: cli_opts,
-            cache_size: toml_conf.cache_size,
-            block_workers: toml_conf.block_workers,
-            wasm_pages: toml_conf.wasm_pages,
-        })
-    }
-
-    fn parse_file(path: &Path) -> Result<TomlConfig> {
-        let toml_str = std::fs::read_to_string(path)?;
-        Ok(toml::from_str(toml_str.as_str())?)
-    }
-
-    pub fn cli(&self) -> &CliOpts {
-        &self.cli
-    }
-
-    pub fn cache_size(&self) -> Option<usize> {
-        self.cache_size
-    }
-
-    pub fn psql_conf(&self) -> MigrationConfig {
-        self.psql_conf.clone()
-    }
-
-    pub fn block_workers(&self) -> Option<usize> {
-        self.block_workers
-    }
-
-    pub fn db_path(&self) -> &Path {
-        self.db_path.as_path()
-    }
-
-    pub fn wasm_pages(&self) -> Option<u64> {
-        self.wasm_pages.clone()
-    }
+	pub fn new() -> Result<Self> {
+		let cli_opts = CliOpts::parse();
+		let toml_conf = Self::parse_file(cli_opts.file.as_path())?;
+		log::debug!("{:?}", toml_conf);
+
+		let psql_conf = MigrationConfig {
+			host: toml_conf.db_host.clone(),
+			port: toml_conf.db_port.clone(),
+			user: toml_conf.db_user.clone(),
+			pass: toml_conf.db_pass.clone(),
+			name: toml_conf.db_name.clone(),
+		};
+
+		Ok(Self {
+			db_path: toml_conf.db_path,
+			psql_conf,
+			cli: cli_opts,
+			cache_size: toml_conf.cache_size,
+			block_workers: toml_conf.block_workers,
+			wasm_pages: toml_conf.wasm_pages,
+		})
+	}
+
+	fn parse_file(path: &Path) -> Result<TomlConfig> {
+		let toml_str = std::fs::read_to_string(path)?;
+		Ok(toml::from_str(toml_str.as_str())?)
+	}
+
+	pub fn cli(&self) -> &CliOpts {
+		&self.cli
+	}
+
+	pub fn cache_size(&self) -> Option<usize> {
+		self.cache_size
+	}
+
+	pub fn psql_conf(&self) -> MigrationConfig {
+		self.psql_conf.clone()
+	}
+
+	pub fn block_workers(&self) -> Option<usize> {
+		self.block_workers
+	}
+
+	pub fn db_path(&self) -> &Path {
+		self.db_path.as_path()
+	}
+
+	pub fn wasm_pages(&self) -> Option<u64> {
+		self.wasm_pages.clone()
+	}
 }

bin/node-template-archive/src/cli_opts.rs

@@ -16,42 +16,39 @@
 mod cli_opts;
 mod config;
 
-use anyhow::Result;
-use node_template_runtime::{self as runtime, opaque::Block};
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
+
+use node_template_runtime::{self as runtime, opaque::Block};
+
 use substrate_archive::{Archive, ArchiveBuilder};
 use substrate_archive_backend::SecondaryRocksDB;
 
-pub fn main() -> Result<()> {
-    let config = config::Config::new()?;
-    substrate_archive::init_logger(config.cli().log_level, log::LevelFilter::Debug)?;
-
-    let mut archive = ArchiveBuilder::<
-        Block,
-        runtime::RuntimeApi,
-        node_template::service::Executor,
-        SecondaryRocksDB,
-    > {
-        block_workers: config.block_workers(),
-        wasm_pages: config.wasm_pages(),
-        cache_size: config.cache_size(),
-        ..ArchiveBuilder::default()
-    }
-    .chain_data_db(config.db_path().to_str().unwrap().to_string())
-    .pg_url(config.psql_conf().url())
-    .chain_spec(Box::new(config.cli().chain_spec.clone()))
-    .build()?;
-    archive.drive()?;
-
-    let running = Arc::new(AtomicBool::new(true));
-    let r = running.clone();
-
-    ctrlc::set_handler(move || {
-        r.store(false, Ordering::SeqCst);
-    })
-    .expect("Error setting Ctrl-C handler");
-    while running.load(Ordering::SeqCst) {}
-    archive.shutdown()?;
-    Ok(())
+pub fn main() -> anyhow::Result<()> {
+	let config = config::Config::new()?;
+	substrate_archive::init_logger(config.cli().log_level, log::LevelFilter::Debug)?;
+
+	let mut archive =
+		ArchiveBuilder::<Block, runtime::RuntimeApi, node_template::service::Executor, SecondaryRocksDB> {
+			block_workers: config.block_workers(),
+			wasm_pages: config.wasm_pages(),
+			cache_size: config.cache_size(),
+			..ArchiveBuilder::default()
+		}
+		.chain_data_db(config.db_path().to_str().unwrap().to_string())
+		.pg_url(config.psql_conf().url())
+		.chain_spec(Box::new(config.cli().chain_spec.clone()))
+		.build()?;
+	archive.drive()?;
+
+	let running = Arc::new(AtomicBool::new(true));
+	let r = running.clone();
+
+	ctrlc::set_handler(move || {
+		r.store(false, Ordering::SeqCst);
+	})
+	.expect("Error setting Ctrl-C handler");
+	while running.load(Ordering::SeqCst) {}
+	archive.shutdown()?;
+	Ok(())
 }