grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:ethcore/parity into jdb_option2

Browse Source
This commit is contained in:
arkpar
2016-03-08 18:35:25 +01:00
parent 744c4c7d8b 9780897fc7
commit ca7d3b91d0
9 changed files with 233 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ethcore/src/client.rs
View File

@@ -87,6 +87,8 @@ pub struct ClientConfig {
pub blockchain: BlockChainConfig,
/// Prefer journal rather than archive.
pub prefer_journal: bool,
/// The name of the client instance.
pub name: String,
}
impl Default for ClientConfig {
@@ -95,6 +97,7 @@ impl Default for ClientConfig {
queue: Default::default(),
blockchain: Default::default(),
prefer_journal: false,
name: Default::default(),
}
}
}
@@ -224,7 +227,7 @@ pub struct Client<V = CanonVerifier> where V: Verifier {
}
const HISTORY: u64 = 1000;
const CLIENT_DB_VER_STR: &'static str = "5.0";
const CLIENT_DB_VER_STR: &'static str = "5.2";
impl Client<CanonVerifier> {
/// Create a new client with given spec and DB path.