xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ecaps2: Remove function convert_element, used only in the tests.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-04-21 01:39:32 +01:00
commit 6600418070
1 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/ecaps2.rs
View file

@ -1,14 +1,9 @@
extern crate minidom;
extern crate sha2; extern crate sha2;
extern crate sha3; extern crate sha3;
extern crate blake2; extern crate blake2;
extern crate base64; extern crate base64;
use minidom::Element; use disco::{Feature, Identity, Disco};
use error::Error;
use disco::{Feature, Identity, Disco, parse_disco};
use data_forms::DataForm; use data_forms::DataForm;
use self::sha2::{Sha256, Sha512, Digest}; use self::sha2::{Sha256, Sha512, Digest};
@ -75,12 +70,6 @@ pub fn compute_disco(disco: &Disco) -> Vec<u8> {
final_string final_string
} }
pub fn convert_element(root: &Element) -> Result<Vec<u8>, Error> {
let disco = parse_disco(root)?;
let final_string = compute_disco(&disco);
Ok(final_string)
}
// TODO: make algo into an enum. // TODO: make algo into an enum.
pub fn hash_ecaps2(data: &[u8], algo: &str) -> String { pub fn hash_ecaps2(data: &[u8], algo: &str) -> String {
match algo { match algo {
@ -131,12 +120,14 @@ pub fn hash_ecaps2(data: &[u8], algo: &str) -> String {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use minidom::Element; use minidom::Element;
use disco;
use ecaps2; use ecaps2;
#[test] #[test]
fn test_simple() { fn test_simple() {
let elem: Element = "<query xmlns='http://jabber.org/protocol/disco#info'><identity category='client' type='pc'/><feature var='http://jabber.org/protocol/disco#info'/></query>".parse().unwrap(); let elem: Element = "<query xmlns='http://jabber.org/protocol/disco#info'><identity category='client' type='pc'/><feature var='http://jabber.org/protocol/disco#info'/></query>".parse().unwrap();
let ecaps2 = ecaps2::convert_element(&elem).unwrap(); let disco = disco::parse_disco(&elem).unwrap();
let ecaps2 = ecaps2::compute_disco(&disco);
assert_eq!(ecaps2.len(), 54); assert_eq!(ecaps2.len(), 54);
} }
@ -198,7 +189,8 @@ mod tests {
105, 109, 101, 31, 28, 99, 108, 105, 101, 110, 116, 31, 109, 111, 105, 109, 101, 31, 28, 99, 108, 105, 101, 110, 116, 31, 109, 111,
98, 105, 108, 101, 31, 31, 66, 111, 109, 98, 117, 115, 77, 111, 98, 105, 108, 101, 31, 31, 66, 111, 109, 98, 117, 115, 77, 111,
100, 31, 30, 28, 28]; 100, 31, 30, 28, 28];
let ecaps2 = ecaps2::convert_element(&elem).unwrap(); let disco = disco::parse_disco(&elem).unwrap();
let ecaps2 = ecaps2::compute_disco(&disco);
assert_eq!(ecaps2.len(), 0x1d9); assert_eq!(ecaps2.len(), 0x1d9);
assert_eq!(ecaps2, expected); assert_eq!(ecaps2, expected);
@ -369,7 +361,8 @@ mod tests {
111, 110, 31, 48, 46, 49, 49, 46, 49, 45, 115, 118, 110, 45, 50, 111, 110, 31, 48, 46, 49, 49, 46, 49, 45, 115, 118, 110, 45, 50,
48, 49, 49, 49, 50, 49, 54, 45, 109, 111, 100, 32, 40, 84, 99, 108, 48, 49, 49, 49, 50, 49, 54, 45, 109, 111, 100, 32, 40, 84, 99, 108,
47, 84, 107, 32, 56, 46,54, 98, 50, 41, 31, 30, 29, 28]; 47, 84, 107, 32, 56, 46,54, 98, 50, 41, 31, 30, 29, 28];
let ecaps2 = ecaps2::convert_element(&elem).unwrap(); let disco = disco::parse_disco(&elem).unwrap();
let ecaps2 = ecaps2::compute_disco(&disco);
assert_eq!(ecaps2.len(), 0x543); assert_eq!(ecaps2.len(), 0x543);
assert_eq!(ecaps2, expected); assert_eq!(ecaps2, expected);