Implemented DNS on blockchain. Beautified a lot of code, fixed some things.
This commit is contained in:
+2
-45
@@ -1,9 +1,6 @@
|
||||
use crate::{Keystore, Blockchain, Bus, Bytes};
|
||||
use crate::{Blockchain, Bus, Keystore};
|
||||
use crate::event::Event;
|
||||
use serde::{Serialize, Deserialize};
|
||||
use std::fs::File;
|
||||
use std::io::Read;
|
||||
use std::sync::MutexGuard;
|
||||
use crate::settings::Settings;
|
||||
|
||||
pub struct Context {
|
||||
pub settings: Settings,
|
||||
@@ -43,44 +40,4 @@ impl Context {
|
||||
pub fn get_blockchain(&self) -> &Blockchain {
|
||||
&self.blockchain
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||
pub struct Settings {
|
||||
pub origin: String,
|
||||
pub version: u32,
|
||||
pub key_file: String,
|
||||
pub listen: String,
|
||||
pub public: bool,
|
||||
pub peers: Vec<String>
|
||||
}
|
||||
|
||||
impl Settings {
|
||||
pub fn new<S: Into<String>>(settings: S) -> serde_json::Result<Settings> {
|
||||
serde_json::from_str(&settings.into())
|
||||
}
|
||||
|
||||
pub fn load(file_name: &str) -> Option<Settings> {
|
||||
match File::open(file_name) {
|
||||
Ok(mut file) => {
|
||||
let mut text = String::new();
|
||||
file.read_to_string(&mut text).unwrap();
|
||||
let loaded = serde_json::from_str(&text);
|
||||
return if loaded.is_ok() {
|
||||
Some(loaded.unwrap())
|
||||
} else {
|
||||
None
|
||||
}
|
||||
},
|
||||
Err(..) => None
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_origin(&self) -> Bytes {
|
||||
if self.origin.eq("") {
|
||||
return Bytes::zero32();
|
||||
}
|
||||
let origin = crate::from_hex(&self.origin).expect("Wrong origin in settings");
|
||||
Bytes::from_bytes(origin.as_slice())
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user