diff options
Diffstat (limited to 'src/message/handshake/clientinitack.rs')
| -rw-r--r-- | src/message/handshake/clientinitack.rs | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/message/handshake/clientinitack.rs b/src/message/handshake/clientinitack.rs index a259f9c..610cdc0 100644 --- a/src/message/handshake/clientinitack.rs +++ b/src/message/handshake/clientinitack.rs @@ -1,8 +1,7 @@ +use crate::error::ProtocolError; use crate::primitive::{Variant, VariantList, VariantMap}; use crate::HandshakeSerialize; -use failure::Error; - /// ClientInitAck is received when the initialization was successfull #[derive(Debug, Clone)] pub struct ClientInitAck { @@ -21,17 +20,14 @@ pub struct ClientInitAck { } impl HandshakeSerialize for ClientInitAck { - fn serialize(&self) -> Result<Vec<u8>, Error> { + fn serialize(&self) -> Result<Vec<u8>, ProtocolError> { let mut values: VariantMap = VariantMap::with_capacity(6); values.insert( "MsgType".to_string(), Variant::String("ClientInitAck".to_string()), ); values.insert("CoreFeatures".to_string(), Variant::u32(self.core_features)); - values.insert( - "Configured".to_string(), - Variant::bool(self.core_configured), - ); + values.insert("Configured".to_string(), Variant::bool(self.core_configured)); values.insert( "StorageBackends".to_string(), Variant::VariantList(self.storage_backends.clone()), @@ -55,15 +51,9 @@ impl From<VariantMap> for ClientInitAck { // TODO make this compatible with older clients core_features: 0, core_configured: match_variant!(input.get("Configured").unwrap(), Variant::bool), - storage_backends: match_variant!( - input.get("StorageBackends").unwrap(), - Variant::VariantList - ), + storage_backends: match_variant!(input.get("StorageBackends").unwrap(), Variant::VariantList), #[cfg(feature = "authenticators")] - authenticators: match_variant!( - input.get("Authenticators").unwrap(), - Variant::VariantList - ), + authenticators: match_variant!(input.get("Authenticators").unwrap(), Variant::VariantList), feature_list: match_variant!(input.get("FeatureList").unwrap(), Variant::StringList), } } |
