diff --git a/src/main.rs b/src/main.rs index 36a99eb..d8ac3a5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -15,13 +15,13 @@ fn main() { .format_timestamp_nanos() .init(); - let mut pckt: SubscriptionPacket<1> = SubscriptionPacket::new(); + let mut pckt: SubscriptionPacket<1, 0> = SubscriptionPacket::new(); let mut res = vec![0; 140]; let lnsub = pckt.encode(&mut res); println!("{:02X?}", &res[0..lnsub]); let mut res2 = vec![0; 260]; let mut x = b"hello world"; - let mut pblsh: PublishPacket = PublishPacket::new(x); + let mut pblsh = PublishPacket::<0>::new(x); let lnpblsh = pblsh.encode(&mut res2); println!("{:02X?}", &res2[0..lnpblsh]); log::info!("xxx"); @@ -51,8 +51,3 @@ fn main() { let prot = std::str::from_utf8(&bytes).unwrap(); log::info!("Protocol name: {}", prot)*/ } - -/*fn test(tst: &str) { - log::info!("xx"); - log::info!("Prvni: {}", ) -}*/ diff --git a/src/utils/buffer_writer.rs b/src/utils/buffer_writer.rs index 23a6d8f..bb6f974 100644 --- a/src/utils/buffer_writer.rs +++ b/src/utils/buffer_writer.rs @@ -10,20 +10,6 @@ pub struct BuffWriter<'a> { } impl<'a> BuffWriter<'a> { - pub fn insert(&mut self, array: [u8; LEN]) { - let mut x: usize = 0; - if LEN != 0 { - loop { - self.buffer[self.position] = array[x]; - self.increment_position(1); - x = x + 1; - if x == LEN { - break; - } - } - } - } - pub fn insert_ref(&mut self, len: usize, array: &[u8]) { let mut x: usize = 0; if len != 0 { @@ -56,12 +42,12 @@ impl<'a> BuffWriter<'a> { pub fn write_u16(&mut self, two_bytes: u16) { let bytes: [u8; 2] = two_bytes.to_be_bytes(); - self.insert::<2>(bytes); + self.insert_ref(2, &bytes); } pub fn write_u32(&mut self, four_bytes: u32) { let bytes: [u8; 4] = four_bytes.to_be_bytes(); - self.insert::<4>(bytes); + self.insert_ref(4,&bytes); } pub fn write_string_ref(&mut self, str: &EncodedString<'a>) {