Skip to content

Commit b12c051

Browse files
dvdplmdvdplm
authored
Merge pull request #129 from paritytech/insipx/update-polkadot
Update Cargo.lock for polkadot 0.8.26
2 parents 481ec93 + 25d08ec commit b12c051

File tree

9 files changed

+1233
-1422
lines changed

9 files changed

+1233
-1422
lines changed

‎Cargo.lock

Lines changed: 387 additions & 594 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bin/node-template-archive/Cargo.lock

Lines changed: 384 additions & 373 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bin/polkadot-archive/Cargo.lock

Lines changed: 263 additions & 227 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bin/polkadot-archive/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-archive"
3-
version = "0.2.1"
3+
version = "0.2.2"
44
authors = ["Andrew Plaza <aplaza@liquidthink.net>"]
55
edition = "2018"
66

‎bin/polkadot-archive/src/archive.rs

Lines changed: 76 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -23,108 +23,90 @@ use polkadot_service::westend_runtime as westend_rt;
2323
use polkadot_service::Block;
2424
use sc_chain_spec::ChainSpec;
2525
use substrate_archive::{Archive, ArchiveBuilder};
26-
use substrate_archive_common::database::ReadOnlyDB;
26+
use substrate_archive_common::ReadOnlyDB;
2727

2828
pub fn run_archive<D: ReadOnlyDB + 'static>(config: Config) -> Result<Box<dyn Archive<Block, D>>> {
29-
let mut db_path = if let Some(p) = config.polkadot_path() {
30-
p
31-
} else {
32-
let path = std::env::var("CHAIN_DATA_DB").expect("CHAIN_DATA_DB must be set.");
33-
std::path::PathBuf::from(path)
34-
};
29+
let mut db_path = if let Some(p) = config.polkadot_path() {
30+
p
31+
} else {
32+
let path = std::env::var("CHAIN_DATA_DB").expect("CHAIN_DATA_DB must be set.");
33+
std::path::PathBuf::from(path)
34+
};
3535

36-
let spec = get_spec(config.cli().chain.as_str())?;
36+
let spec = get_spec(config.cli().chain.as_str())?;
3737

38-
let last_path_part = db_path
39-
.file_name()
40-
.context("Polkadot path not valid")?
41-
.to_str()
42-
.context("could not convert path to string")?;
38+
let last_path_part =
39+
db_path.file_name().context("Polkadot path not valid")?.to_str().context("could not convert path to string")?;
4340

44-
match last_path_part {
45-
"polkadot" => db_path.push(format!("chains/{}/db", spec.id())),
46-
"chains" => db_path.push(format!("{}/db", spec.id())),
47-
_ => return Err(anyhow!("invalid path {}", db_path.as_path().display())),
48-
}
41+
match last_path_part {
42+
"polkadot" => db_path.push(format!("chains/{}/db", spec.id())),
43+
"chains" => db_path.push(format!("{}/db", spec.id())),
44+
_ => return Err(anyhow!("invalid path {}", db_path.as_path().display())),
45+
}
4946

50-
let db_path = db_path
51-
.as_path()
52-
.to_str()
53-
.context("could not convert rocksdb path to str")?
54-
.to_string();
47+
let db_path = db_path.as_path().to_str().context("could not convert rocksdb path to str")?.to_string();
5548

56-
match config.cli().chain.to_ascii_lowercase().as_str() {
57-
"kusama" | "ksm" => {
58-
let archive =
59-
ArchiveBuilder::<Block, ksm_rt::RuntimeApi, polkadot_service::KusamaExecutor, D> {
60-
pg_url: config.psql_conf().map(|u| u.url()),
61-
cache_size: config.cache_size(),
62-
block_workers: config.block_workers(),
63-
wasm_pages: config.wasm_pages(),
64-
max_block_load: config.max_block_load(),
65-
..ArchiveBuilder::default()
66-
}
67-
.chain_data_db(db_path)
68-
.chain_spec(spec)
69-
.build()?;
70-
Ok(Box::new(archive))
71-
}
72-
"westend" => {
73-
let archive = ArchiveBuilder::<
74-
Block,
75-
westend_rt::RuntimeApi,
76-
polkadot_service::WestendExecutor,
77-
D,
78-
> {
79-
pg_url: config.psql_conf().map(|u| u.url()),
80-
cache_size: config.cache_size(),
81-
block_workers: config.block_workers(),
82-
wasm_pages: config.wasm_pages(),
83-
max_block_load: config.max_block_load(),
84-
..ArchiveBuilder::default()
85-
}
86-
.chain_data_db(db_path)
87-
.chain_spec(spec)
88-
.build()?;
89-
Ok(Box::new(archive))
90-
}
91-
"polkadot" | "dot" => {
92-
let archive = ArchiveBuilder::<
93-
Block,
94-
dot_rt::RuntimeApi,
95-
polkadot_service::PolkadotExecutor,
96-
D,
97-
> {
98-
pg_url: config.psql_conf().map(|u| u.url()),
99-
cache_size: config.cache_size(),
100-
block_workers: config.block_workers(),
101-
wasm_pages: config.wasm_pages(),
102-
max_block_load: config.max_block_load(),
103-
..ArchiveBuilder::default()
104-
}
105-
.chain_data_db(db_path)
106-
.chain_spec(spec)
107-
.build()?;
108-
Ok(Box::new(archive))
109-
}
110-
c => Err(anyhow!("unknown chain {}", c)),
111-
}
49+
match config.cli().chain.to_ascii_lowercase().as_str() {
50+
"kusama" | "ksm" => {
51+
let archive = ArchiveBuilder::<Block, ksm_rt::RuntimeApi, polkadot_service::KusamaExecutor, D> {
52+
pg_url: config.psql_conf().map(|u| u.url()),
53+
cache_size: config.cache_size(),
54+
block_workers: config.block_workers(),
55+
wasm_pages: config.wasm_pages(),
56+
max_block_load: config.max_block_load(),
57+
..ArchiveBuilder::default()
58+
}
59+
.chain_data_db(db_path)
60+
.chain_spec(spec)
61+
.build()?;
62+
Ok(Box::new(archive))
63+
}
64+
"westend" => {
65+
let archive = ArchiveBuilder::<Block, westend_rt::RuntimeApi, polkadot_service::WestendExecutor, D> {
66+
pg_url: config.psql_conf().map(|u| u.url()),
67+
cache_size: config.cache_size(),
68+
block_workers: config.block_workers(),
69+
wasm_pages: config.wasm_pages(),
70+
max_block_load: config.max_block_load(),
71+
..ArchiveBuilder::default()
72+
}
73+
.chain_data_db(db_path)
74+
.chain_spec(spec)
75+
.build()?;
76+
Ok(Box::new(archive))
77+
}
78+
"polkadot" | "dot" => {
79+
let archive = ArchiveBuilder::<Block, dot_rt::RuntimeApi, polkadot_service::PolkadotExecutor, D> {
80+
pg_url: config.psql_conf().map(|u| u.url()),
81+
cache_size: config.cache_size(),
82+
block_workers: config.block_workers(),
83+
wasm_pages: config.wasm_pages(),
84+
max_block_load: config.max_block_load(),
85+
..ArchiveBuilder::default()
86+
}
87+
.chain_data_db(db_path)
88+
.chain_spec(spec)
89+
.build()?;
90+
Ok(Box::new(archive))
91+
}
92+
c => Err(anyhow!("unknown chain {}", c)),
93+
}
11294
}
11395

11496
fn get_spec(chain: &str) -> Result<Box<dyn ChainSpec>> {
115-
match chain.to_ascii_lowercase().as_str() {
116-
"kusama" | "ksm" => {
117-
let spec = polkadot_service::chain_spec::kusama_config().unwrap();
118-
Ok(Box::new(spec) as Box<dyn ChainSpec>)
119-
}
120-
"westend" => {
121-
let spec = polkadot_service::chain_spec::westend_config().unwrap();
122-
Ok(Box::new(spec) as Box<dyn ChainSpec>)
123-
}
124-
"polkadot" | "dot" => {
125-
let spec = polkadot_service::chain_spec::polkadot_config().unwrap();
126-
Ok(Box::new(spec) as Box<dyn ChainSpec>)
127-
}
128-
c => Err(anyhow!("unknown chain {}", c)),
129-
}
97+
match chain.to_ascii_lowercase().as_str() {
98+
"kusama" | "ksm" => {
99+
let spec = polkadot_service::chain_spec::kusama_config().unwrap();
100+
Ok(Box::new(spec) as Box<dyn ChainSpec>)
101+
}
102+
"westend" => {
103+
let spec = polkadot_service::chain_spec::westend_config().unwrap();
104+
Ok(Box::new(spec) as Box<dyn ChainSpec>)
105+
}
106+
"polkadot" | "dot" => {
107+
let spec = polkadot_service::chain_spec::polkadot_config().unwrap();
108+
Ok(Box::new(spec) as Box<dyn ChainSpec>)
109+
}
110+
c => Err(anyhow!("unknown chain {}", c)),
111+
}
130112
}

‎bin/polkadot-archive/src/cli_opts.rs

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,28 @@ use std::path::PathBuf;
1919

2020
#[derive(Debug, Clone)]
2121
pub struct CliOpts {
22-
pub file: Option<PathBuf>,
23-
pub log_level: log::LevelFilter,
24-
pub log_num: u64,
25-
pub chain: String,
22+
pub file: Option<PathBuf>,
23+
pub log_level: log::LevelFilter,
24+
pub log_num: u64,
25+
pub chain: String,
2626
}
2727

2828
impl CliOpts {
29-
pub fn parse() -> Self {
30-
let yaml = load_yaml!("cli_opts.yaml");
31-
let matches = App::from(yaml).get_matches();
32-
let log_level = match matches.occurrences_of("verbose") {
33-
0 => log::LevelFilter::Info,
34-
1 => log::LevelFilter::Info,
35-
2 => log::LevelFilter::Info,
36-
3 => log::LevelFilter::Debug,
37-
4 | _ => log::LevelFilter::Trace,
38-
};
39-
let log_num = matches.occurrences_of("verbose");
40-
let file = matches.value_of("config");
41-
42-
let chain = matches.value_of("chain").unwrap_or("polkadot");
43-
44-
CliOpts {
45-
file: file.map(|f| PathBuf::from(f)),
46-
log_level,
47-
log_num,
48-
chain: chain.to_string(),
49-
}
50-
}
29+
pub fn parse() -> Self {
30+
let yaml = load_yaml!("cli_opts.yaml");
31+
let matches = App::from(yaml).get_matches();
32+
let log_level = match matches.occurrences_of("verbose") {
33+
0 => log::LevelFilter::Info,
34+
1 => log::LevelFilter::Info,
35+
2 => log::LevelFilter::Info,
36+
3 => log::LevelFilter::Debug,
37+
4 | _ => log::LevelFilter::Trace,
38+
};
39+
let log_num = matches.occurrences_of("verbose");
40+
let file = matches.value_of("config");
41+
42+
let chain = matches.value_of("chain").unwrap_or("polkadot");
43+
44+
CliOpts { file: file.map(|f| PathBuf::from(f)), log_level, log_num, chain: chain.to_string() }
45+
}
5146
}

‎bin/polkadot-archive/src/cli_opts.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: polkadot-archive
2-
version: "0.2"
1+
name: polkadot-archive
2+
version: "0.2.2"
33
author: Andrew P. <andrew.plaza@parity.io>
44
about: Indexes the Polkadot, Kusama and Westend Networks
55
args:

0 commit comments

Comments
 (0)