difftreelog
NFTPAR-268 CreateCollection Tests Broken. Null terminated strings replaced with fixed size strings
in: master
2 files changed
pallets/nft/src/lib.rsdiffbeforeafterboth--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -561,18 +561,9 @@
// check params
ensure!(decimal_points <= MAX_DECIMAL_POINTS, Error::<T>::CollectionDecimalPointLimitExceeded);
-
- let mut name = collection_name.to_vec();
- name.push(0);
- ensure!(name.len() <= 64, Error::<T>::CollectionNameLimitExceeded);
-
- let mut description = collection_description.to_vec();
- description.push(0);
- ensure!(name.len() <= 256, Error::<T>::CollectionDescriptionLimitExceeded);
-
- let mut prefix = token_prefix.to_vec();
- prefix.push(0);
- ensure!(prefix.len() <= 16, Error::<T>::CollectionTokenPrefixLimitExceeded);
+ ensure!(collection_name.len() <= 64, Error::<T>::CollectionNameLimitExceeded);
+ ensure!(collection_description.len() <= 256, Error::<T>::CollectionDescriptionLimitExceeded);
+ ensure!(token_prefix.len() <= 16, Error::<T>::CollectionTokenPrefixLimitExceeded);
// Generate next collection ID
let next_id = CreatedCollectionCount::get()
@@ -590,13 +581,13 @@
// Create new collection
let new_collection = CollectionType {
owner: who.clone(),
- name: name,
+ name: collection_name,
mode: mode.clone(),
mint_mode: false,
access: AccessMode::Normal,
- description: description,
+ description: collection_description,
decimal_points: decimal_points,
- token_prefix: prefix,
+ token_prefix: token_prefix,
offchain_schema: Vec::new(),
schema_version: SchemaVersion::ImageURL,
sponsor: T::AccountId::default(),
pallets/nft/src/tests.rsdiffbeforeafterboth49 mode.clone()49 mode.clone()50 ));50 ));515152 let saved_col_name: Vec<u16> = "Test1\0\0".encode_utf16().collect::<Vec<u16>>();52 let saved_col_name: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();53 let saved_description: Vec<u16> = "TestDescription1\0\0".encode_utf16().collect::<Vec<u16>>();53 let saved_description: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();54 let saved_prefix: Vec<u8> = b"token_prefix1\0\0".to_vec();54 let saved_prefix: Vec<u8> = b"token_prefix1\0".to_vec();55 assert_eq!(TemplateModule::collection(id).owner, owner);55 assert_eq!(TemplateModule::collection(id).owner, owner);56 assert_eq!(TemplateModule::collection(id).name, saved_col_name);56 assert_eq!(TemplateModule::collection(id).name, saved_col_name);57 assert_eq!(TemplateModule::collection(id).mode, *mode);57 assert_eq!(TemplateModule::collection(id).mode, *mode);