pep/xmpp-rs-mirror
1
0
Fork 0
mirror of https://gitlab.com/xmpp-rs/xmpp-rs.git synced 2024-07-12 22:21:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

server_info: Remove remaining FORM_TYPE handling.

Browse source 
Also reenables the test.
This commit is contained in:
Emmanuel Gil Peyrot 2019-03-20 19:09:14 +01:00
parent ba5a014de9
commit cbc787a9d4
1 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/server_info.rs
View file

@ -9,7 +9,7 @@ use crate::util::error::Error;
use try_from::TryFrom; use try_from::TryFrom;
/// Structure representing a `http://jabber.org/network/serverinfo` form type. /// Structure representing a `http://jabber.org/network/serverinfo` form type.
#[derive(Debug, Clone)] #[derive(Debug, Clone, PartialEq)]
pub struct ServerInfo { pub struct ServerInfo {
/// Abuse addresses /// Abuse addresses
pub abuse: Vec<String>, pub abuse: Vec<String>,
@ -81,15 +81,6 @@ impl From<ServerInfo> for DataForm {
title: None, title: None,
instructions: None, instructions: None,
fields: vec![ fields: vec![
Field {
var: String::from("FORM_TYPE"),
type_: FieldType::Hidden,
label: None,
required: false,
options: vec![],
values: vec![String::from(ns::SERVER_INFO)],
media: vec![],
},
generate_address_field("abuse-addresses", server_info.abuse), generate_address_field("abuse-addresses", server_info.abuse),
generate_address_field("admin-addresses", server_info.admin), generate_address_field("admin-addresses", server_info.admin),
generate_address_field("feedback-addresses", server_info.feedback), generate_address_field("feedback-addresses", server_info.feedback),
@ -139,15 +130,6 @@ mod tests {
title: None, title: None,
instructions: None, instructions: None,
fields: vec![ fields: vec![
Field {
var: String::from("FORM_TYPE"),
type_: FieldType::Hidden,
label: None,
required: false,
options: vec![],
values: vec![String::from(ns::SERVER_INFO)],
media: vec![],
},
Field { Field {
var: String::from("abuse-addresses"), var: String::from("abuse-addresses"),
type_: FieldType::ListMulti, type_: FieldType::ListMulti,
@ -229,6 +211,6 @@ mod tests {
}; };
// assert_eq!(DataForm::from(server_info), form); // assert_eq!(DataForm::from(server_info), form);
// assert_eq!(ServerInfo::try_from(form), Ok(form)); assert_eq!(ServerInfo::try_from(form).unwrap(), server_info);
} }
} }