fix(conference): change file name of chane_name.rs

NamsooCho · NamsooCho · commit 81a13a2e4fd2 · 2019-05-03T10:03:28.000+09:00
diff --git a/src/toxcore/messenger/conference/packet/action.rs b/src/toxcore/messenger/conference/packet/action.rs
@@ -6,7 +6,7 @@ use nom::{be_u16, be_u32, rest};
 
 use crate::toxcore::binary_io::*;
 
-/** ConferenceAction is the struct that holds info to send action to a conference.
+/** Action is the struct that holds info to send action to a conference.
 
 Sent to notify action to all member of conference.
 
@@ -23,7 +23,7 @@ variable  | `action`(UTF-8 C String)
 
 */
 #[derive(Clone, Debug, Eq, PartialEq)]
-pub struct ConferenceAction {
+pub struct Action {
     conference_number: u16,
     peer_number: u16,
     message_number: u32,
@@ -32,15 +32,15 @@ pub struct ConferenceAction {
     action: String,
 }
 
-impl FromBytes for ConferenceAction {
-    named!(from_bytes<ConferenceAction>, do_parse!(
+impl FromBytes for Action {
+    named!(from_bytes<Action>, do_parse!(
         tag!("\x63") >>
         conference_number: be_u16 >>
         peer_number: be_u16 >>
         message_number: be_u32 >>
         tag!("\x41") >>
         action: map_res!(rest, str::from_utf8) >>
-        (ConferenceAction {
+        (Action {
             conference_number,
             peer_number,
             message_number,
@@ -49,7 +49,7 @@ impl FromBytes for ConferenceAction {
     ));
 }
 
-impl ToBytes for ConferenceAction {
+impl ToBytes for Action {
     fn to_bytes<'a>(&self, buf: (&'a mut [u8], usize)) -> Result<(&'a mut [u8], usize), GenError> {
         do_gen!(buf,
             gen_be_u8!(0x63) >>
@@ -62,10 +62,10 @@ impl ToBytes for ConferenceAction {
     }
 }
 
-impl ConferenceAction {
-    /// Create new ConferenceAction object.
+impl Action {
+    /// Create new Action object.
     pub fn new(conference_number: u16, peer_number: u16, message_number: u32, action: String) -> Self {
-        ConferenceAction {
+        Action {
             conference_number,
             peer_number,
             message_number,
@@ -80,14 +80,14 @@ mod tests {
 
     encode_decode_test!(
         conference_action_encode_decode,
-        ConferenceAction::new(1, 2, 3, "1234".to_owned())
+        Action::new(1, 2, 3, "1234".to_owned())
     );
 
     #[test]
     fn conference_action_from_bytes_encoding_error() {
         let err_string = vec![0, 159, 146, 150]; // not UTF8 bytes.
         let mut buf = vec![0x63, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x41];
         buf.extend_from_slice(&err_string);
-        assert!(ConferenceAction::from_bytes(&buf).is_err());
+        assert!(Action::from_bytes(&buf).is_err());
     }
 }
diff --git a/src/toxcore/messenger/conference/packet/change_name.rs b/src/toxcore/messenger/conference/packet/change_name.rs
diff --git a/src/toxcore/messenger/conference/packet/message.rs b/src/toxcore/messenger/conference/packet/message.rs
@@ -6,7 +6,7 @@ use nom::{be_u16, be_u32, rest};
 
 use crate::toxcore::binary_io::*;
 
-/** ConferenceMessage is the struct that holds info to send chat message to a conference.
+/** Message is the struct that holds info to send chat message to a conference.
 
 Sent to notify chat message to all member of conference.
 
@@ -23,7 +23,7 @@ variable  | `message`(UTF-8 C String)
 
 */
 #[derive(Clone, Debug, Eq, PartialEq)]
-pub struct ConferenceMessage {
+pub struct Message {
     conference_number: u16,
     peer_number: u16,
     message_number: u32,
@@ -32,15 +32,15 @@ pub struct ConferenceMessage {
     message: String,
 }
 
-impl FromBytes for ConferenceMessage {
-    named!(from_bytes<ConferenceMessage>, do_parse!(
+impl FromBytes for Message {
+    named!(from_bytes<Message>, do_parse!(
         tag!("\x63") >>
         conference_number: be_u16 >>
         peer_number: be_u16 >>
         message_number: be_u32 >>
         tag!("\x40") >>
         message: map_res!(rest, str::from_utf8) >>
-        (ConferenceMessage {
+        (Message {
             conference_number,
             peer_number,
             message_number,
@@ -49,7 +49,7 @@ impl FromBytes for ConferenceMessage {
     ));
 }
 
-impl ToBytes for ConferenceMessage {
+impl ToBytes for Message {
     fn to_bytes<'a>(&self, buf: (&'a mut [u8], usize)) -> Result<(&'a mut [u8], usize), GenError> {
         do_gen!(buf,
             gen_be_u8!(0x63) >>
@@ -62,10 +62,10 @@ impl ToBytes for ConferenceMessage {
     }
 }
 
-impl ConferenceMessage {
-    /// Create new ConferenceMessage object.
+impl Message {
+    /// Create new Message object.
     pub fn new(conference_number: u16, peer_number: u16, message_number: u32, message: String) -> Self {
-        ConferenceMessage {
+        Message {
             conference_number,
             peer_number,
             message_number,
@@ -80,14 +80,14 @@ mod tests {
 
     encode_decode_test!(
         conference_message_encode_decode,
-        ConferenceMessage::new(1, 2, 3, "1234".to_owned())
+        Message::new(1, 2, 3, "1234".to_owned())
     );
 
     #[test]
     fn conference_message_from_bytes_encoding_error() {
         let err_string = vec![0, 159, 146, 150]; // not UTF8 bytes.
         let mut buf = vec![0x63, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x40];
         buf.extend_from_slice(&err_string);
-        assert!(ConferenceMessage::from_bytes(&buf).is_err());
+        assert!(Message::from_bytes(&buf).is_err());
     }
 }
diff --git a/src/toxcore/messenger/conference/packet/mod.rs b/src/toxcore/messenger/conference/packet/mod.rs
@@ -12,10 +12,10 @@ mod ping;
 mod new_peer;
 mod kill_peer;
 mod freeze_peer;
-mod chane_name;
+mod change_name;
 mod change_title;
-mod conference_message;
-mod conference_action;
+mod message;
+mod action;
 
 pub use self::invite::*;
 pub use self::invite_response::*;
@@ -28,19 +28,19 @@ pub use self::ping::*;
 pub use self::new_peer::*;
 pub use self::kill_peer::*;
 pub use self::freeze_peer::*;
-pub use self::chane_name::*;
+pub use self::change_name::*;
 pub use self::change_title::*;
-pub use self::conference_message::*;
-pub use self::conference_action::*;
+pub use self::message::*;
+pub use self::action::*;
 
 use nom::be_u8;
 use crate::toxcore::binary_io::*;
 use crate::toxcore::crypto_core::*;
 
-/// Length in bytes of conference unique bytes
+/// Length in bytes of conference unique bytes.
 pub const CONFERENCE_UID_BYTES: usize = 32;
 
-/// Length in bytes of various names in conference
+/// Length in bytes of various names in conference.
 pub const MAX_NAME_LENGTH_IN_CONFERENCE: usize = 128;
 
 /// Unique id used in conference
@@ -83,9 +83,9 @@ impl ToBytes for ConferenceUID {
 /// Type of conference
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum ConferenceType {
-    /// Text conference conference.
+    /// Text conference.
     Text = 0x00,
-    /// Audio conference conference.
+    /// Audio conference.
     Audio,
 }
 
@@ -128,10 +128,10 @@ pub enum Packet {
     ChangeName(ChangeName),
     /// [`ChangeTitle`](./struct.ChangeTitle.html) structure.
     ChangeTitle(ChangeTitle),
-    /// [`ConferenceMessage`](./struct.ConferenceMessage.html) structure.
-    ConferenceMessage(ConferenceMessage),
-    /// [`ConferenceAction`](./struct.ConferenceAction.html) structure.
-    ConferenceAction(ConferenceAction),
+    /// [`Message`](./struct.Message.html) structure.
+    Message(Message),
+    /// [`Action`](./struct.Action.html) structure.
+    Action(Action),
 }
 
 impl ToBytes for Packet {
@@ -150,8 +150,8 @@ impl ToBytes for Packet {
             Packet::FreezePeer(ref p) => p.to_bytes(buf),
             Packet::ChangeName(ref p) => p.to_bytes(buf),
             Packet::ChangeTitle(ref p) => p.to_bytes(buf),
-            Packet::ConferenceMessage(ref p) => p.to_bytes(buf),
-            Packet::ConferenceAction(ref p) => p.to_bytes(buf),
+            Packet::Message(ref p) => p.to_bytes(buf),
+            Packet::Action(ref p) => p.to_bytes(buf),
         }
     }
 }
@@ -171,8 +171,8 @@ impl FromBytes for Packet {
         map!(FreezePeer::from_bytes, Packet::FreezePeer) |
         map!(ChangeName::from_bytes, Packet::ChangeName) |
         map!(ChangeTitle::from_bytes, Packet::ChangeTitle) |
-        map!(ConferenceMessage::from_bytes, Packet::ConferenceMessage) |
-        map!(ConferenceAction::from_bytes, Packet::ConferenceAction)
+        map!(Message::from_bytes, Packet::Message) |
+        map!(Action::from_bytes, Packet::Action)
     ));
 }
 
@@ -262,11 +262,11 @@ mod tests {
 
     encode_decode_test!(
         packet_conference_message_encode_decode,
-        Packet::ConferenceMessage(ConferenceMessage::new(1, 2, 3, "1234".to_owned()))
+        Packet::Message(Message::new(1, 2, 3, "1234".to_owned()))
     );
 
     encode_decode_test!(
         packet_conference_action_encode_decode,
-        Packet::ConferenceAction(ConferenceAction::new(1, 2, 3, "1234".to_owned()))
+        Packet::Action(Action::new(1, 2, 3, "1234".to_owned()))
     );
 }
diff --git a/src/toxcore/messenger/packet/mod.rs b/src/toxcore/messenger/packet/mod.rs
@@ -29,7 +29,7 @@ pub use self::file_data::*;
 pub use self::status_message::*;
 pub use self::file_send_request::*;
 
-pub use crate::toxcore::messenger::conference::packet::{Packet as ConferencePacket, *};
+pub use crate::toxcore::messenger::conference::packet::Packet as ConferencePacket;
 
 /** Messenger packet enum that encapsulates all types of Messenger packets.
 */
@@ -104,6 +104,7 @@ impl FromBytes for Packet {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::toxcore::messenger::conference::packet::{ConferenceType, ConferenceUID, Invite};
 
     encode_decode_test!(
         packet_online_encode_decode,
