Merge branch 'jsonrpc' into jsonrpc2

This commit is contained in:
debris 2016-02-09 13:25:47 +01:00
commit ac2ee42804
2 changed files with 2 additions and 2 deletions

View File

@ -168,7 +168,7 @@ pub struct Client {
}
const HISTORY: u64 = 1000;
const CLIENT_DB_VER_STR: &'static str = "1.0";
const CLIENT_DB_VER_STR: &'static str = "2.0";
impl Client {
/// Create a new client with given spec and DB path.

View File

@ -50,7 +50,7 @@ impl Clone for JournalDB {
const LAST_ERA_KEY : [u8; 4] = [ b'l', b'a', b's', b't' ];
const VERSION_KEY : [u8; 4] = [ b'j', b'v', b'e', b'r' ];
const DB_VERSION: u32 = 2;
const DB_VERSION: u32 = 1;
impl JournalDB {
/// Create a new instance given a `backing` database.