From 31c9ea38932be5b6e779893d91d2e50f991ba35c Mon Sep 17 00:00:00 2001 From: str-mv Date: Wed, 30 Dec 2020 09:43:23 +0000 Subject: [PATCH] NFTPAR-268 CreateCollection Tests Broken. Null terminated strings replaced with fixed size strings --- --- 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::::CollectionDecimalPointLimitExceeded); - - let mut name = collection_name.to_vec(); - name.push(0); - ensure!(name.len() <= 64, Error::::CollectionNameLimitExceeded); - - let mut description = collection_description.to_vec(); - description.push(0); - ensure!(name.len() <= 256, Error::::CollectionDescriptionLimitExceeded); - - let mut prefix = token_prefix.to_vec(); - prefix.push(0); - ensure!(prefix.len() <= 16, Error::::CollectionTokenPrefixLimitExceeded); + ensure!(collection_name.len() <= 64, Error::::CollectionNameLimitExceeded); + ensure!(collection_description.len() <= 256, Error::::CollectionDescriptionLimitExceeded); + ensure!(token_prefix.len() <= 16, Error::::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(), --- a/pallets/nft/src/tests.rs +++ b/pallets/nft/src/tests.rs @@ -49,9 +49,9 @@ mode.clone() )); - let saved_col_name: Vec = "Test1\0\0".encode_utf16().collect::>(); - let saved_description: Vec = "TestDescription1\0\0".encode_utf16().collect::>(); - let saved_prefix: Vec = b"token_prefix1\0\0".to_vec(); + let saved_col_name: Vec = "Test1\0".encode_utf16().collect::>(); + let saved_description: Vec = "TestDescription1\0".encode_utf16().collect::>(); + let saved_prefix: Vec = b"token_prefix1\0".to_vec(); assert_eq!(TemplateModule::collection(id).owner, owner); assert_eq!(TemplateModule::collection(id).name, saved_col_name); assert_eq!(TemplateModule::collection(id).mode, *mode); -- gitstuff