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

pricing { linear: {} }

Browse Source
This commit is contained in:
debris
2016-03-18 22:54:36 +01:00
parent e4ec80941c
commit 79aa8570d0
11 changed files with 42 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
json/src/spec/builtin.rs
View File

@@ -16,8 +16,6 @@
//! Spec builtin deserialization.
use serde::de::{Deserialize, Deserializer};
/// Linear pricing.
#[derive(Debug, PartialEq, Deserialize)]
pub struct Linear {
@@ -26,20 +24,13 @@ pub struct Linear {
}
/// Pricing variants.
#[derive(Debug, PartialEq)]
#[derive(Debug, PartialEq, Deserialize)]
pub enum Pricing {
/// Linear pricing.
#[serde(rename="linear")]
Linear(Linear),
}
impl Deserialize for Pricing {
fn deserialize<D>(deserializer: &mut D) -> Result<Self, D::Error>
where D: Deserializer {
Deserialize::deserialize(deserializer).map(Pricing::Linear)
}
}
/// Spec builtin.
#[derive(Debug, PartialEq, Deserialize)]
pub struct Builtin {
@@ -56,7 +47,7 @@ mod tests {
fn builtin_deserialization() {
let s = r#"{
"name": "ecrecover",
"pricing": { "base": 3000, "word": 0 }
"pricing": { "linear": { "base": 3000, "word": 0 } }
}"#;
let _deserialized: Builtin = serde_json::from_str(s).unwrap();
// TODO: validate all fields