git.delta.rocks / unique-network / refs/commits / a37fff1b7f7d

difftreelog

misk: small fix and some docks

Trubnikov Sergey2022-12-15parent: #08e7d28.patch.diff
in: master

4 files changed

modifiedcrates/evm-coder/tests/abi_derive_generation.rsdiffbeforeafterboth
740 /// Some docs740 /// Some docs
741 /// At multi741 /// At multi
742 /// line742 /// line
743 #[derive(AbiCoder, Debug, PartialEq, Default)]743 #[derive(AbiCoder, Debug, PartialEq, Default, Clone, Copy)]
744 #[repr(u8)]744 #[repr(u8)]
745 enum Color {745 enum Color {
746 /// Docs for Red746 /// Docs for Red
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
140 .map_err(dispatch_to_evm::<T>)140 .map_err(dispatch_to_evm::<T>)
141 }141 }
142142
143 /// @notice Get permissions for token properties.
143 fn token_property_permissions(144 fn token_property_permissions(
144 &self,145 &self,
145 ) -> Result<Vec<(string, Vec<(EthTokenPermissions, bool)>)>> {146 ) -> Result<Vec<(string, Vec<(EthTokenPermissions, bool)>)>> {
146 let mut res = <Vec<_>>::new();147 let mut res = <Vec<_>>::new();
147 for (key, pp) in <Pallet<T>>::token_property_permission(self.id) {148 for (key, pp) in <Pallet<T>>::token_property_permission(self.id) {
148 let key = string::from_utf8(key.into_inner()).unwrap();149 let key = string::from_utf8(key.into_inner()).unwrap();
149 let pp = [150 let pp = vec![
150 (EthTokenPermissions::Mutable, pp.mutable),151 (EthTokenPermissions::Mutable, pp.mutable),
151 (EthTokenPermissions::TokenOwner, pp.token_owner),152 (EthTokenPermissions::TokenOwner, pp.token_owner),
152 (EthTokenPermissions::CollectionAdmin, pp.collection_admin),153 (EthTokenPermissions::CollectionAdmin, pp.collection_admin),
153 ]154 ];
154 .into();
155 res.push((key, pp));155 res.push((key, pp));
156 }156 }
157 Ok(res)157 Ok(res)
modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
143 .map_err(dispatch_to_evm::<T>)143 .map_err(dispatch_to_evm::<T>)
144 }144 }
145145
146 /// @notice Get permissions for token properties.
146 fn token_property_permissions(147 fn token_property_permissions(
147 &self,148 &self,
148 ) -> Result<Vec<(string, Vec<(EthTokenPermissions, bool)>)>> {149 ) -> Result<Vec<(string, Vec<(EthTokenPermissions, bool)>)>> {
modifiedtests/src/eth/tokenProperties.test.tsdiffbeforeafterboth
33 });33 });
3434
35 itEth('Can be reconfigured', async({helper}) => {35 itEth('Can be reconfigured', async({helper}) => {
36 const owner = await helper.eth.createAccountWithBalance(donor);
36 const caller = await helper.eth.createAccountWithBalance(donor);37 const caller = await helper.eth.createAccountWithBalance(donor);
37 for(const [mutable,collectionAdmin, tokenOwner] of cartesian([], [false, true], [false, true], [false, true])) {38 for(const [mutable,collectionAdmin, tokenOwner] of cartesian([], [false, true], [false, true], [false, true])) {
38 const collection = await helper.nft.mintCollection(alice);39 const collection = await helper.nft.mintCollection(alice);