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

fixed parity tests with new serde and toml

Browse Source
This commit is contained in:
debris 2017-07-06 14:10:41 +02:00
parent 44ae70e9ec
commit f4f8b411f5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
parity/cli/mod.rs
View File

@ -382,6 +382,7 @@ usage! {
#[derive(Default, Debug, PartialEq, Deserialize)] #[derive(Default, Debug, PartialEq, Deserialize)]
#[serde(deny_unknown_fields)]
struct Config { struct Config {
parity: Option<Operating>, parity: Option<Operating>,
account: Option<Account>, account: Option<Account>,
@ -647,7 +648,7 @@ mod tests {
#[test] #[test]
fn should_parse_full_config() { fn should_parse_full_config() {
// given // given
let config = toml::decode_str(include_str!("./config.full.toml")).unwrap(); let config = toml::from_str(include_str!("./config.full.toml")).unwrap();
// when // when
let args = Args::parse_with_config(&["parity", "--chain", "xyz"], config).unwrap(); let args = Args::parse_with_config(&["parity", "--chain", "xyz"], config).unwrap();
@ -897,7 +898,7 @@ mod tests {
let config3 = Args::parse_config(include_str!("./config.invalid3.toml")); let config3 = Args::parse_config(include_str!("./config.invalid3.toml"));
match (config1, config2, config3) { match (config1, config2, config3) {
(Err(ArgsError::Parsing(_)), Err(ArgsError::Decode(_)), Err(ArgsError::UnknownFields(_))) => {}, (Err(ArgsError::Decode(_)), Err(ArgsError::Decode(_)), Err(ArgsError::Decode(_))) => {},
(a, b, c) => { (a, b, c) => {
assert!(false, "Got invalid error types: {:?}, {:?}, {:?}", a, b, c); assert!(false, "Got invalid error types: {:?}, {:?}, {:?}", a, b, c);
} }
@ -906,7 +907,7 @@ mod tests {
#[test] #[test]
fn should_deserialize_toml_file() { fn should_deserialize_toml_file() {
let config: Config = toml::decode_str(include_str!("./config.toml")).unwrap(); let config: Config = toml::from_str(include_str!("./config.toml")).unwrap();
assert_eq!(config, Config { assert_eq!(config, Config {
parity: Some(Operating { parity: Some(Operating {