@@ -822,9 +822,9 @@ where
822
822
) ) ;
823
823
}
824
824
} else {
825
- if len <= * l || len >= * u {
825
+ if len < * l || len >= * u {
826
826
self . add_error ( format ! (
827
- "expected uint to be in range {} < value < {}, got Bytes({:?})" ,
827
+ "expected uint to be in range {} <= value < {}, got Bytes({:?})" ,
828
828
l, u, b
829
829
) ) ;
830
830
}
@@ -843,9 +843,9 @@ where
843
843
}
844
844
845
845
return Ok ( ( ) ) ;
846
- } else if s. len ( ) <= * l || s. len ( ) >= * u {
846
+ } else if s. len ( ) < * l || s. len ( ) >= * u {
847
847
self . add_error ( format ! (
848
- "expected \" {}\" string length to be in the range {} < value < {}, got {}" ,
848
+ "expected \" {}\" string length to be in the range {} <= value < {}, got {}" ,
849
849
s, l, u, len
850
850
) ) ;
851
851
return Ok ( ( ) ) ;
@@ -865,9 +865,9 @@ where
865
865
) ) ;
866
866
}
867
867
} else {
868
- if i128:: from ( * i) <= * l as i128 || i128:: from ( * i) >= * u as i128 {
868
+ if i128:: from ( * i) < * l as i128 || i128:: from ( * i) >= * u as i128 {
869
869
self . add_error ( format ! (
870
- "expected integer to be in range {} < value < {}, got {:?}" ,
870
+ "expected integer to be in range {} <= value < {}, got {:?}" ,
871
871
l, u, i
872
872
) ) ;
873
873
}
@@ -3893,7 +3893,7 @@ mod tests {
3893
3893
let mut cv = CBORValidator :: new ( & cddl, valid_cbor) ;
3894
3894
assert ! ( cv. validate( ) . is_ok( ) ) ;
3895
3895
3896
- // Test boundary case (16 bytes - should fail )
3896
+ // Test boundary case (16 bytes - should pass )
3897
3897
let boundary_bytes = vec ! [ 0u8 ; 16 ] ;
3898
3898
let boundary_cbor = ciborium:: value:: Value :: Map ( vec ! [ (
3899
3899
ciborium:: value:: Value :: Text ( "field" . to_string( ) ) ,
@@ -3904,7 +3904,7 @@ mod tests {
3904
3904
let mut cv = CBORValidator :: new ( & cddl, boundary_cbor, None ) ;
3905
3905
#[ cfg( not( feature = "additional-controls" ) ) ]
3906
3906
let mut cv = CBORValidator :: new ( & cddl, boundary_cbor) ;
3907
- assert ! ( cv. validate( ) . is_err ( ) ) ;
3907
+ assert ! ( cv. validate( ) . is_ok ( ) ) ;
3908
3908
3909
3909
Ok ( ( ) )
3910
3910
}
0 commit comments