From 45ba557a5acd3b569311f54f8730f3f7855bd8ce Mon Sep 17 00:00:00 2001 From: dylanVerstraete Date: Wed, 15 Feb 2023 13:01:54 +0100 Subject: [PATCH] chore: apply fix for #601 --- substrate-node/pallets/pallet-tfgrid/src/node.rs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/substrate-node/pallets/pallet-tfgrid/src/node.rs b/substrate-node/pallets/pallet-tfgrid/src/node.rs index 7563e0c00..5816df042 100644 --- a/substrate-node/pallets/pallet-tfgrid/src/node.rs +++ b/substrate-node/pallets/pallet-tfgrid/src/node.rs @@ -294,8 +294,7 @@ pub fn validate_longitude_input(input: &[u8]) -> bool { } } -pub const MIN_SERIAL_NUMBER_LENGTH: u32 = 10; -pub const MAX_SERIAL_NUMBER_LENGTH: u32 = 50; +pub const MAX_SERIAL_NUMBER_LENGTH: u32 = 128; pub const DEFAULT_SERIAL_NUMBER: &[u8] = b"Not Specified"; /// A serial number in ASCI Characters. @@ -314,10 +313,6 @@ impl TryFrom for SerialNumber { /// minimum or exceeds the maximum allowed length or contains invalid ASCII /// characters. fn try_from(value: SerialNumberInput) -> Result { - ensure!( - value.len() >= MIN_SERIAL_NUMBER_LENGTH.saturated_into(), - Self::Error::SerialNumberTooShort - ); ensure!( value.len() <= MAX_SERIAL_NUMBER_LENGTH.saturated_into(), Self::Error::SerialNumberTooLong @@ -358,9 +353,9 @@ impl Clone for SerialNumber { pub fn validate_serial_number(input: &[u8]) -> bool { input == DEFAULT_SERIAL_NUMBER - || input - .iter() - .all(|c| c.is_ascii_alphanumeric() || matches!(c, b'-' | b'_' | b'.')) + || input.iter().all(|c| { + c.is_ascii_alphanumeric() || c.is_ascii_whitespace() || matches!(c, b'-' | b'_' | b'.') + }) } #[test]