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

Add registrar fields (#4716)

Browse Source 
* add registrar field

* use constructor for dev registrar

* fix test
This commit is contained in:
keorn
2017-03-02 12:25:55 +01:00
committed by Gav Wood
parent 5dd406a19a
commit ade5a13f5b
11 changed files with 100 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
json/src/spec/engine.rs
View File

@@ -16,7 +16,7 @@
//! Engine deserialization.
use super::{Ethash, BasicAuthority, AuthorityRound, Tendermint};
use super::{Ethash, InstantSeal, BasicAuthority, AuthorityRound, Tendermint};
/// Engine deserialization.
#[derive(Debug, PartialEq, Deserialize)]
@@ -26,7 +26,7 @@ pub enum Engine {
Null,
/// Instantly sealing engine.
#[serde(rename="instantSeal")]
InstantSeal,
InstantSeal(InstantSeal),
/// Ethash engine.
Ethash(Ethash),
/// BasicAuthority engine.
@@ -55,12 +55,10 @@ mod tests {
assert_eq!(Engine::Null, deserialized);
let s = r#"{
"instantSeal": null
"instantSeal": { "params": {} }
}"#;
let deserialized: Engine = serde_json::from_str(s).unwrap();
assert_eq!(Engine::InstantSeal, deserialized);
let _deserialized: Engine = serde_json::from_str(s).unwrap();
let s = r#"{
"Ethash": {