feat: deal with unwrap()

This commit is contained in:
2020-11-08 00:02:03 +08:00
parent cad9dfe606
commit 228e006fb5
2 changed files with 45 additions and 28 deletions

View File

@@ -4,15 +4,19 @@ use crate::sig::SigningKeyPair;
use rust_util::XResult;
lazy_static::lazy_static! {
static ref SIGNING_KEY_PAIR: Option<SigningKeyPair> = load_signing_key_pair();
static ref SIGNING_KEY_PAIR: Option<SigningKeyPair> = load_signing_key_pair_ok();
}
pub fn get_signing_public_key() -> Option<String> {
SIGNING_KEY_PAIR.as_ref().map(|key_pair| hex::encode(&key_pair.public_key()))
}
pub fn load_signing_key_pair() -> Option<SigningKeyPair> {
SigningKeyPair::read_from_file("platform_signing_key.json").ok()
pub fn load_signing_key_pair() -> XResult<SigningKeyPair> {
SigningKeyPair::read_from_file("platform_signing_key.json")
}
pub fn load_signing_key_pair_ok() -> Option<SigningKeyPair> {
load_signing_key_pair().ok()
}
pub fn read_file(f: &str) -> XResult<String> {