State pruning (#216)

* Started work on state db

* Updated for a new hash type

* Pruning and tests

* Generalize on the block hash/key type

* Integrate with the client backend

* Merge w master

* CLI options

* Updated for light client refactoring

* Used IntoIterator

* Fixed invalid input hadling
This commit is contained in:
Arkadiy Paronyan
2018-06-28 17:30:24 +02:00
committed by Gav Wood
parent de8dedd878
commit a53b47e11a
5 changed files with 23 additions and 1 deletions
+5
View File
@@ -75,6 +75,11 @@ args:
value_name: CHAIN_SPEC
help: Specify the chain specification (one of dev, local or poc-2)
takes_value: true
- pruning:
long: pruning
value_name: PRUNING_MODE
help: Specify the pruning mode. (a number of blocks to keep or "archive"). Default is 256.
takes_value: true
- name:
long: name
value_name: NAME
+5
View File
@@ -28,5 +28,10 @@ error_chain! {
Client(client::error::Error, client::error::ErrorKind) #[doc="Client error"];
}
errors {
/// Input error.
Input(m: String) {
description("Invalid input"),
display("{}", m),
}
}
}
+7
View File
@@ -83,6 +83,7 @@ use polkadot_primitives::Block;
use futures::sync::mpsc;
use futures::{Sink, Future, Stream};
use tokio_core::reactor;
use service::PruningMode;
const DEFAULT_TELEMETRY_URL: &str = "ws://telemetry.polkadot.io:1024";
@@ -189,6 +190,12 @@ pub fn run<I, T>(args: I) -> error::Result<()> where
.into();
config.database_path = db_path(&base_path).to_string_lossy().into();
config.pruning = match matches.value_of("pruning") {
Some("archive") => PruningMode::ArchiveAll,
None => PruningMode::keep_blocks(256),
Some(s) => PruningMode::keep_blocks(s.parse()
.map_err(|_| error::ErrorKind::Input("Invalid pruning mode specified".to_owned()))?),
};
let (mut genesis_storage, boot_nodes) = PresetConfig::from_spec(chain_spec)
.map(PresetConfig::deconstruct)
+4
View File
@@ -20,6 +20,7 @@ use transaction_pool;
use runtime_primitives::MakeStorage;
pub use network::Role;
pub use network::NetworkConfiguration;
pub use client_db::PruningMode;
/// Service configuration.
pub struct Configuration {
@@ -33,6 +34,8 @@ pub struct Configuration {
pub keystore_path: String,
/// Path to the database.
pub database_path: String,
/// Pruning settings.
pub pruning: PruningMode,
/// Additional key seeds.
pub keys: Vec<String>,
/// The name of the chain.
@@ -58,6 +61,7 @@ impl Default for Configuration {
genesis_storage: Box::new(Default::default),
telemetry: Default::default(),
name: "Anonymous".into(),
pruning: PruningMode::ArchiveAll,
}
}
}
+2 -1
View File
@@ -68,7 +68,7 @@ use exit_future::Signal;
pub use self::error::{ErrorKind, Error};
pub use self::components::{Components, FullComponents, LightComponents};
pub use config::{Configuration, Role};
pub use config::{Configuration, Role, PruningMode};
/// Polkadot service.
pub struct Service<Components: components::Components> {
@@ -118,6 +118,7 @@ impl<Components> Service<Components>
let db_settings = client_db::DatabaseSettings {
cache_size: None,
path: config.database_path.into(),
pruning: config.pruning,
};
let (client, on_demand) = components.build_client(db_settings, executor, config.genesis_storage)?;