1
1
#![ cfg( feature = "std" ) ]
2
2
use tls_codec:: {
3
- Deserialize , Error , Serialize , Size , TlsSliceU16 , TlsVecU16 , TlsVecU32 , TlsVecU8 , VLBytes ,
3
+ Deserialize , DeserializeBytes , Error , Serialize , Size , TlsSliceU16 , TlsVecU16 , TlsVecU32 ,
4
+ TlsVecU8 , VLBytes ,
4
5
} ;
5
6
use tls_codec_derive:: { TlsDeserialize , TlsDeserializeBytes , TlsSerialize , TlsSize } ;
6
7
@@ -58,10 +59,7 @@ fn tuple_struct() {
58
59
let serialized_t1 = t1. tls_serialize_detached ( ) . unwrap ( ) ;
59
60
let deserialized_t1 = TupleStruct1 :: tls_deserialize ( & mut serialized_t1. as_slice ( ) ) . unwrap ( ) ;
60
61
let ( deserialized_bytes_t1, _remainder) =
61
- <TupleStruct1 as tls_codec:: DeserializeBytes >:: tls_deserialize_bytes (
62
- serialized_t1. as_slice ( ) ,
63
- )
64
- . unwrap ( ) ;
62
+ TupleStruct1 :: tls_deserialize_bytes ( serialized_t1. as_slice ( ) ) . unwrap ( ) ;
65
63
assert_eq ! ( t1, deserialized_t1) ;
66
64
assert_eq ! ( t1, deserialized_bytes_t1) ;
67
65
assert_eq ! (
@@ -77,10 +75,7 @@ fn tuple_struct() {
77
75
let serialized_t2 = t2. tls_serialize_detached ( ) . unwrap ( ) ;
78
76
let deserialized_t2 = TupleStruct :: tls_deserialize ( & mut serialized_t2. as_slice ( ) ) . unwrap ( ) ;
79
77
let ( deserialized_bytes_t2, _remainder) =
80
- <TupleStruct as tls_codec:: DeserializeBytes >:: tls_deserialize_bytes (
81
- serialized_t2. as_slice ( ) ,
82
- )
83
- . unwrap ( ) ;
78
+ TupleStruct :: tls_deserialize_bytes ( serialized_t2. as_slice ( ) ) . unwrap ( ) ;
84
79
assert_eq ! ( t2, deserialized_t2) ;
85
80
assert_eq ! ( t2, deserialized_bytes_t2) ;
86
81
assert_eq ! (
@@ -98,8 +93,7 @@ fn simple_enum() {
98
93
let b = & [ 0u8 , 5 ] as & [ u8 ] ;
99
94
let mut b_reader = b;
100
95
let deserialized = ExtensionType :: tls_deserialize ( & mut b_reader) . unwrap ( ) ;
101
- let ( deserialized_bytes, _remainder) =
102
- <ExtensionType as tls_codec:: DeserializeBytes >:: tls_deserialize_bytes ( b) . unwrap ( ) ;
96
+ let ( deserialized_bytes, _remainder) = ExtensionType :: tls_deserialize_bytes ( b) . unwrap ( ) ;
103
97
assert_eq ! ( ExtensionType :: RatchetTree , deserialized) ;
104
98
assert_eq ! ( ExtensionType :: RatchetTree , deserialized_bytes) ;
105
99
@@ -113,8 +107,7 @@ fn simple_enum() {
113
107
for variant in variants. iter ( ) {
114
108
let deserialized = ExtensionType :: tls_deserialize ( & mut b_reader) . unwrap ( ) ;
115
109
assert_eq ! ( variant, & deserialized) ;
116
- let ( deserialized_bytes, remainder) =
117
- <ExtensionType as tls_codec:: DeserializeBytes >:: tls_deserialize_bytes ( b) . unwrap ( ) ;
110
+ let ( deserialized_bytes, remainder) = ExtensionType :: tls_deserialize_bytes ( b) . unwrap ( ) ;
118
111
b = remainder;
119
112
assert_eq ! ( variant, & deserialized_bytes) ;
120
113
}
@@ -133,11 +126,9 @@ fn deserialize_tls_vec() {
133
126
assert_eq ! ( long_vector. len( ) , deserialized_long_vec. len( ) ) ;
134
127
assert_eq ! ( long_vector, deserialized_long_vec) ;
135
128
let ( deserialized_long_vec_bytes, _remainder) : ( Vec < ExtensionStruct > , & [ u8 ] ) =
136
- <TlsVecU16 < ExtensionStruct > as tls_codec:: DeserializeBytes >:: tls_deserialize_bytes (
137
- serialized_long_vec. as_slice ( ) ,
138
- )
139
- . map ( |( v, r) | ( v. into ( ) , r) )
140
- . unwrap ( ) ;
129
+ TlsVecU16 :: < ExtensionStruct > :: tls_deserialize_bytes ( serialized_long_vec. as_slice ( ) )
130
+ . map ( |( v, r) | ( v. into ( ) , r) )
131
+ . unwrap ( ) ;
141
132
assert_eq ! ( long_vector. len( ) , deserialized_long_vec_bytes. len( ) ) ;
142
133
assert_eq ! ( long_vector, deserialized_long_vec_bytes) ;
143
134
}
0 commit comments