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

fixed secret_store conversion from kvdb error

Browse Source
This commit is contained in:
debris 2017-10-16 14:55:11 +02:00
parent 8ecdab68c2
commit 7661e93a56
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
secret_store/src/key_storage.rs
View File

@ -132,7 +132,7 @@ impl PersistentKeyStorage {
db_path.push("db"); db_path.push("db");
let db_path = db_path.to_str().ok_or(Error::Database("Invalid secretstore path".to_owned()))?; let db_path = db_path.to_str().ok_or(Error::Database("Invalid secretstore path".to_owned()))?;
let db = Database::open_default(&db_path).map_err(Error::Database)?; let db = Database::open_default(&db_path)?;
let db = upgrade_db(db)?; let db = upgrade_db(db)?;
Ok(PersistentKeyStorage { Ok(PersistentKeyStorage {
@ -142,7 +142,7 @@ impl PersistentKeyStorage {
} }
fn upgrade_db(db: Database) -> Result<Database, Error> { fn upgrade_db(db: Database) -> Result<Database, Error> {
let version = db.get(None, DB_META_KEY_VERSION).map_err(Error::Database)?; let version = db.get(None, DB_META_KEY_VERSION)?;
let version = version.and_then(|v| v.get(0).cloned()).unwrap_or(0); let version = version.and_then(|v| v.get(0).cloned()).unwrap_or(0);
match version { match version {
0 => { 0 => {
@ -164,7 +164,7 @@ fn upgrade_db(db: Database) -> Result<Database, Error> {
let db_value = serde_json::to_vec(&v2_key).map_err(|e| Error::Database(e.to_string()))?; let db_value = serde_json::to_vec(&v2_key).map_err(|e| Error::Database(e.to_string()))?;
batch.put(None, &*db_key, &*db_value); batch.put(None, &*db_key, &*db_value);
} }
db.write(batch).map_err(Error::Database)?; db.write(batch)?;
Ok(db) Ok(db)
}, },
1 => { 1 => {
@ -184,7 +184,7 @@ fn upgrade_db(db: Database) -> Result<Database, Error> {
let db_value = serde_json::to_vec(&v2_key).map_err(|e| Error::Database(e.to_string()))?; let db_value = serde_json::to_vec(&v2_key).map_err(|e| Error::Database(e.to_string()))?;
batch.put(None, &*db_key, &*db_value); batch.put(None, &*db_key, &*db_value);
} }
db.write(batch).map_err(Error::Database)?; db.write(batch)?;
Ok(db) Ok(db)
} }
2 => Ok(db), 2 => Ok(db),
@ -198,7 +198,7 @@ impl KeyStorage for PersistentKeyStorage {
let key = serde_json::to_vec(&key).map_err(|e| Error::Database(e.to_string()))?; let key = serde_json::to_vec(&key).map_err(|e| Error::Database(e.to_string()))?;
let mut batch = self.db.transaction(); let mut batch = self.db.transaction();
batch.put(None, &document, &key); batch.put(None, &document, &key);
self.db.write(batch).map_err(Error::Database) self.db.write(batch).map_err(Into::into)
} }
fn update(&self, document: ServerKeyId, key: DocumentKeyShare) -> Result<(), Error> { fn update(&self, document: ServerKeyId, key: DocumentKeyShare) -> Result<(), Error> {
@ -206,8 +206,7 @@ impl KeyStorage for PersistentKeyStorage {
} }
fn get(&self, document: &ServerKeyId) -> Result<DocumentKeyShare, Error> { fn get(&self, document: &ServerKeyId) -> Result<DocumentKeyShare, Error> {
self.db.get(None, document) self.db.get(None, document)?
.map_err(Error::Database)?
.ok_or(Error::DocumentNotFound) .ok_or(Error::DocumentNotFound)
.map(|key| key.into_vec()) .map(|key| key.into_vec())
.and_then(|key| serde_json::from_slice::<CurrentSerializableDocumentKeyShare>(&key).map_err(|e| Error::Database(e.to_string()))) .and_then(|key| serde_json::from_slice::<CurrentSerializableDocumentKeyShare>(&key).map_err(|e| Error::Database(e.to_string())))
@ -217,7 +216,7 @@ impl KeyStorage for PersistentKeyStorage {
fn remove(&self, document: &ServerKeyId) -> Result<(), Error> { fn remove(&self, document: &ServerKeyId) -> Result<(), Error> {
let mut batch = self.db.transaction(); let mut batch = self.db.transaction();
batch.delete(None, &document); batch.delete(None, &document);
self.db.write(batch).map_err(Error::Database) self.db.write(batch).map_err(Into::into)
} }
fn contains(&self, document: &ServerKeyId) -> bool { fn contains(&self, document: &ServerKeyId) -> bool {

11
secret_store/src/types/all.rs
View File

@ -18,10 +18,7 @@ use std::fmt;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use serde_json; use serde_json;
use ethkey; use {ethkey, kvdb, bytes, bigint, key_server_cluster};
use bytes;
use bigint;
use key_server_cluster;
/// Node id. /// Node id.
pub type NodeId = ethkey::Public; pub type NodeId = ethkey::Public;
@ -134,6 +131,12 @@ impl From<ethkey::Error> for Error {
} }
} }
impl From<kvdb::Error> for Error {
fn from(err: kvdb::Error) -> Self {
Error::Database(err.to_string())
}
}
impl From<key_server_cluster::Error> for Error { impl From<key_server_cluster::Error> for Error {
fn from(err: key_server_cluster::Error) -> Self { fn from(err: key_server_cluster::Error) -> Self {
match err { match err {