git.delta.rocks / unique-network / refs/commits / 84e2b3d75476

difftreelog

CORE-386 Fix PR

Trubnikov Sergey2022-06-10parent: #32d10d5.patch.diff
in: master

1 file changed

modifiedpallets/common/src/erc.rsdiffbeforeafterboth
53where53where
54 T::AccountId: From<[u8; 32]>,54 T::AccountId: From<[u8; 32]>,
55{55{
56 fn set_collection_property(&mut self, caller: caller, key: string, value: bytes) -> Result<()> {56 fn set_collection_property(&mut self, caller: caller, key: string, value: bytes) -> Result<void> {
57 let caller = T::CrossAccountId::from_eth(caller);57 let caller = T::CrossAccountId::from_eth(caller);
58 let key = <Vec<u8>>::from(key)58 let key = <Vec<u8>>::from(key)
59 .try_into()59 .try_into()
228 )228 )
229 .map_err(dispatch_to_evm::<T>)?;229 .map_err(dispatch_to_evm::<T>)?;
230230
231 save(self)?;231 save(self)
232 Ok(())
233 }232 }
234233
235 #[solidity(rename_selector = "setNesting")]234 #[solidity(rename_selector = "setNesting")]
273 )272 )
274 .map_err(dispatch_to_evm::<T>)?;273 .map_err(dispatch_to_evm::<T>)?;
275 274
276 save(self)?;275 save(self)
277 Ok(())
278 }276 }
279277
280 fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {278 fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {
281 check_is_owner_or_admin(caller, self)?;279 check_is_owner_or_admin(caller, self)?;
282 self.collection.permissions.access = Some(match mode {280 let permissions = CollectionPermissions{
281 access: Some(match mode {
283 0 => AccessMode::Normal,282 0 => AccessMode::Normal,
284 1 => AccessMode::AllowList,283 1 => AccessMode::AllowList,
285 _ => return Err("Not supported access mode".into()),284 _ => return Err("Not supported access mode".into()),
286 });285 }),
286 .. Default::default()
287 };
287 save(self)?;288 self.collection.permissions = <Pallet<T>>::clamp_permissions(
289 self.collection.mode.clone(),
290 &self.collection.permissions,
291 permissions,
292 )
293 .map_err(dispatch_to_evm::<T>)?;
294
288 Ok(())295 save(self)
289 }296 }
290297
291 fn add_to_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {298 fn add_to_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {
304311
305 fn set_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {312 fn set_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {
306 check_is_owner_or_admin(caller, self)?;313 check_is_owner_or_admin(caller, self)?;
314 let permissions = CollectionPermissions { mint_mode: Some(mode), .. Default::default() };
307 self.collection.permissions.mint_mode = Some(mode);315 self.collection.permissions = <Pallet<T>>::clamp_permissions(
316 self.collection.mode.clone(),
317 &self.collection.permissions,
318 permissions,
319 )
320 .map_err(dispatch_to_evm::<T>)?;
321
308 save(self)?;322 save(self)
309 Ok(())
310 }323 }
311}324}
312325